From a907aa9be22b59535d42bcff9ee8803267f475dc Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Tue, 4 Jan 2022 11:04:53 +0800 Subject: [PATCH 01/15] [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 620a195591228..3d701fa75c927 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 d3b5d422ee801..7e5e4c8f290b5 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 0000000000000..bcaae254ee68a --- /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 ec88ac66a5ac1..a88260a18eb39 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 0ae5ab29f54ca..8536e1707798e 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 8bc7dbd7d0eb3..d2db924bf1219 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 05eb27a161039..2a3bdf659ae78 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 6dc560c8f96f0..2296f23be6dca 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 f0dc89dee1a6a..830d39edfbbc1 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 a61b4f110ab77..6ede3735f133d 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 783bdd2978eda..e2c7dabdf8a44 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/15] 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 7e5e4c8f290b5..990e4e3bf0c44 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/15] 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 3d701fa75c927..28443ac9b1f25 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 990e4e3bf0c44..dcabea5b249c8 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 ec81f0322ca53..ef79d222a8315 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 830d39edfbbc1..09a2fb1ae1bda 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 e2c7dabdf8a44..cdb07ff298991 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/15] [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 28443ac9b1f25..1fb700cf39cb3 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 dcabea5b249c8..63a56d4df4d7b 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 fc5f63bde9ce0..6cd911726e6c5 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 0000000000000..8f4c66ca5d0d7 --- /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 09a2fb1ae1bda..b295c8ca31aa7 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 6ede3735f133d..b8679468bfabb 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/15] [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 1fb700cf39cb3..3a4c095fa7050 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 63a56d4df4d7b..bbf160f0ad801 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 0000000000000..d177176b91bbd --- /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 0000000000000..248ef5440521a --- /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 0000000000000..25cd34c60cf0c --- /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 0000000000000..90f77239c6f74 --- /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 0000000000000..a1389ad2974a8 --- /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 0000000000000..0832da2391988 --- /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 0000000000000..b94be41797b97 --- /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 0000000000000..c37b3cd21ac52 --- /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 0000000000000..fb0d08c8b2ee6 --- /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 0000000000000..bbc61008bcbb5 --- /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 0000000000000..fe1b0cb5872fa --- /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 0000000000000..1c22f1d59e138 --- /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 0000000000000..4f43799c39e50 --- /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 0000000000000..c55e6cb6488f6 --- /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 b295c8ca31aa7..f2f3af9bb8db2 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 b8679468bfabb..ebb109eea6ef2 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 cdb07ff298991..78af312785ddf 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/15] [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 3a4c095fa7050..4315c8929c478 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 bbf160f0ad801..0aa36b40757ec 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 0000000000000..b2d499d9e1f27 --- /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 22903288be1cc..43d85ea4bf7cc 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 f2f3af9bb8db2..94b94fc5a6196 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 ebb109eea6ef2..8c705581933ed 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 4aa8e2c921760..de3f4c024172d 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/15] [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 4315c8929c478..4a3a5bafea921 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 0aa36b40757ec..b123bf6a1c550 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 0000000000000..3ebdc58a4b4cf --- /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 062a707223fec..c8bc0a59f9441 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 0000000000000..502c8137f185b --- /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 ddd80da8c3b48..3e1c004afe256 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 94b94fc5a6196..ccb48ed761b84 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 8c705581933ed..36ce1994512c1 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 de3f4c024172d..9de815de1e756 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/15] 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 b123bf6a1c550..44549cdc59938 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 ccb48ed761b84..7b2b832bbe297 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 36ce1994512c1..04dcf8343d002 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/15] [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 4a3a5bafea921..e2ac3ef58b31f 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 44549cdc59938..cc70308d0581b 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 0000000000000..c6c62f799ce11 --- /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 0000000000000..e96061386dcda --- /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 0000000000000..ce6096d3ff32c --- /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 0000000000000..61d0e8c285362 --- /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 8738edfa640ef..4241c71b432fd 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 0000000000000..a15f723eb5934 --- /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 7b2b832bbe297..7fa0078207649 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 04dcf8343d002..595a38390f508 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 78af312785ddf..90bf33d2fe852 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/15] 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 595a38390f508..952a88018607f 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")] From 5857bc6f14d5824c2e1093b64112d0772ec2ffe2 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Mon, 23 May 2022 11:17:39 +0800 Subject: [PATCH 11/15] [DataFactory]Added new features into 6.2.0 --- .../datafactory_resource-manager.txt | 4 +- .../src/CHANGELOG.md | 7 + .../ExecuteWranglingDataflowActivity.cs | 56 + .../src/Customizations/Factory.cs | 49 + .../Generated/DataFactoryManagementClient.cs | 6 + .../Generated/GlobalParametersOperations.cs | 1200 +++++++++++++++++ .../GlobalParametersOperationsExtensions.cs | 240 ++++ .../Generated/IDataFactoryManagementClient.cs | 5 + .../Generated/IGlobalParametersOperations.cs | 158 +++ .../src/Generated/Models/DataFlowSink.cs | 15 +- .../Models/ExecuteDataFlowActivity.cs | 14 +- .../ExecuteWranglingDataflowActivity.cs | 14 +- .../src/Generated/Models/Factory.cs | 11 +- .../Models/GlobalParameterResource.cs | 83 ++ .../src/Generated/Models/PowerQuerySink.cs | 6 +- .../Generated/Models/PurviewConfiguration.cs | 51 + ...rosoft.Azure.Management.DataFactory.csproj | 8 +- .../src/Properties/AssemblyInfo.cs | 2 +- 18 files changed, 1917 insertions(+), 12 deletions(-) create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/ExecuteWranglingDataflowActivity.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/Factory.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/GlobalParametersOperations.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/GlobalParametersOperationsExtensions.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/IGlobalParametersOperations.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GlobalParameterResource.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PurviewConfiguration.cs diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt index e2ac3ef58b31f..463ac08f23a1d 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-26 01:41:21 UTC +2022-05-23 02:58:44 UTC Azure-rest-api-specs repository information GitHub fork: Azure Branch: main -Commit: fb32676995912336709a2af7d7250e0b63c9333d +Commit: d916ae110aa385d49cd24787a05611345696644b 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 cc70308d0581b..b9324a5ded6c5 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog for the Azure Data Factory V2 .NET SDK +## Version 6.2.0 +### Feature Additions +- Added globalParameters apis into ADF +- Added support for running staging on multiple sources in parallel +- Added purview configuration into ADF +- Added support rejected data linked service in dataflow sink + ## Version 6.1.0 ### Feature Additions - Added Dataworld, AppFigures, Asana, Twilio connectors in ADF diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/ExecuteWranglingDataflowActivity.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/ExecuteWranglingDataflowActivity.cs new file mode 100644 index 0000000000000..6a162164be31f --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/ExecuteWranglingDataflowActivity.cs @@ -0,0 +1,56 @@ +using System.Collections.Generic; + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + public partial class ExecuteWranglingDataflowActivity : Activity + { + /// + /// Initializes a new instance of the ExecuteWranglingDataflowActivity + /// class. + /// + /// Activity name. + /// Data flow reference. + /// Unmatched properties from the + /// message are deserialized this collection + /// Activity description. + /// Activity depends on condition. + /// Activity user properties. + /// Staging info for execute data flow + /// activity. + /// The integration runtime + /// reference. + /// Compute properties for data flow + /// activity. + /// Trace level setting used for data flow + /// monitoring output. Supported values are: 'coarse', 'fine', and + /// 'none'. Type: string (or Expression with resultType string) + /// Continue on error setting used for + /// data flow execution. Enables processing to continue if a sink + /// fails. Type: boolean (or Expression with resultType + /// boolean) + /// Concurrent run setting used for data + /// flow execution. Allows sinks with the same save order to be + /// processed concurrently. Type: boolean (or Expression with + /// resultType boolean) + /// (Deprecated. Please use Queries). List of Power + /// Query activity sinks mapped to a queryName. + /// List of mapping for Power Query mashup query + /// to sink dataset(s). + /// Activity policy. + public ExecuteWranglingDataflowActivity(string name, DataFlowReference dataFlow, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), DataFlowStagingInfo staging = default(DataFlowStagingInfo), IntegrationRuntimeReference integrationRuntime = default(IntegrationRuntimeReference), ExecuteDataFlowActivityTypePropertiesCompute compute = default(ExecuteDataFlowActivityTypePropertiesCompute), object traceLevel = default(object), object continueOnError = default(object), object runConcurrently = default(object), IDictionary sinks = default(IDictionary), IList queries = default(IList), ActivityPolicy policy = default(ActivityPolicy)) + : base(name, additionalProperties, description, dependsOn, userProperties) + { + DataFlow = dataFlow; + Staging = staging; + IntegrationRuntime = integrationRuntime; + Compute = compute; + TraceLevel = traceLevel; + ContinueOnError = continueOnError; + RunConcurrently = runConcurrently; + Sinks = sinks; + Queries = queries; + Policy = policy; + CustomInit(); + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/Factory.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/Factory.cs new file mode 100644 index 0000000000000..25b441d8dfd3d --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/Factory.cs @@ -0,0 +1,49 @@ +using System.Collections.Generic; + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + public partial class Factory : Resource + { + /// + /// Initializes a new instance of the Factory class. + /// + /// The resource identifier. + /// The resource name. + /// The resource type. + /// The resource location. + /// The resource tags. + /// Etag identifies change in the resource. + /// Unmatched properties from the + /// message are deserialized this collection + /// Managed service identity of the + /// factory. + /// Factory provisioning state, example + /// Succeeded. + /// Time the factory was created in ISO8601 + /// format. + /// Version of the factory. + /// Git repo information of the + /// factory. + /// List of parameters for + /// factory. + /// Properties to enable Customer Managed Key + /// for the factory. + /// Whether or not public network + /// access is allowed for the data factory. Possible values include: + /// 'Enabled', 'Disabled' + public Factory(string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary tags = default(IDictionary), string eTag = default(string), IDictionary additionalProperties = default(IDictionary), FactoryIdentity identity = default(FactoryIdentity), string provisioningState = default(string), System.DateTime? createTime = default(System.DateTime?), string version = default(string), FactoryRepoConfiguration repoConfiguration = default(FactoryRepoConfiguration), IDictionary globalParameters = default(IDictionary), EncryptionConfiguration encryption = default(EncryptionConfiguration), string publicNetworkAccess = default(string)) + : base(id, name, type, location, tags, eTag) + { + AdditionalProperties = additionalProperties; + Identity = identity; + ProvisioningState = provisioningState; + CreateTime = createTime; + Version = version; + RepoConfiguration = repoConfiguration; + GlobalParameters = globalParameters; + Encryption = encryption; + PublicNetworkAccess = publicNetworkAccess; + CustomInit(); + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/DataFactoryManagementClient.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/DataFactoryManagementClient.cs index a602715ee4050..a7b0179ff6a53 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/DataFactoryManagementClient.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/DataFactoryManagementClient.cs @@ -175,6 +175,11 @@ public partial class DataFactoryManagementClient : ServiceClient public virtual IPrivateLinkResourcesOperations PrivateLinkResources { get; private set; } + /// + /// Gets the IGlobalParametersOperations. + /// + public virtual IGlobalParametersOperations GlobalParameters { get; private set; } + /// /// Initializes a new instance of the DataFactoryManagementClient class. /// @@ -436,6 +441,7 @@ private void Initialize() PrivateEndPointConnections = new PrivateEndPointConnectionsOperations(this); PrivateEndpointConnection = new PrivateEndpointConnectionOperations(this); PrivateLinkResources = new PrivateLinkResourcesOperations(this); + GlobalParameters = new GlobalParametersOperations(this); BaseUri = new System.Uri("https://management.azure.com"); ApiVersion = "2018-06-01"; AcceptLanguage = "en-US"; diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/GlobalParametersOperations.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/GlobalParametersOperations.cs new file mode 100644 index 0000000000000..2571dc4aeadbb --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/GlobalParametersOperations.cs @@ -0,0 +1,1200 @@ +// +// 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 +{ + using Microsoft.Rest; + using Microsoft.Rest.Azure; + using Models; + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + using System.Net; + using System.Net.Http; + using System.Threading; + using System.Threading.Tasks; + + /// + /// GlobalParametersOperations operations. + /// + internal partial class GlobalParametersOperations : IServiceOperations, IGlobalParametersOperations + { + /// + /// Initializes a new instance of the GlobalParametersOperations class. + /// + /// + /// Reference to the service client. + /// + /// + /// Thrown when a required parameter is null + /// + internal GlobalParametersOperations(DataFactoryManagementClient client) + { + if (client == null) + { + throw new System.ArgumentNullException("client"); + } + Client = client; + } + + /// + /// Gets a reference to the DataFactoryManagementClient + /// + public DataFactoryManagementClient Client { get; private set; } + + /// + /// Lists Global parameters + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// Headers that will be added to request. + /// + /// + /// The cancellation token. + /// + /// + /// Thrown when the operation returned an invalid status code + /// + /// + /// Thrown when unable to deserialize the response + /// + /// + /// Thrown when a required parameter is null + /// + /// + /// Thrown when a required parameter is null + /// + /// + /// A response object containing the response body and response headers. + /// + public async Task>> ListByFactoryWithHttpMessagesAsync(string resourceGroupName, string factoryName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + { + if (Client.SubscriptionId == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); + } + if (resourceGroupName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName"); + } + if (resourceGroupName != null) + { + if (resourceGroupName.Length > 90) + { + throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90); + } + if (resourceGroupName.Length < 1) + { + throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1); + } + if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+$")) + { + throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+$"); + } + } + if (factoryName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "factoryName"); + } + if (factoryName != null) + { + if (factoryName.Length > 63) + { + throw new ValidationException(ValidationRules.MaxLength, "factoryName", 63); + } + if (factoryName.Length < 3) + { + throw new ValidationException(ValidationRules.MinLength, "factoryName", 3); + } + if (!System.Text.RegularExpressions.Regex.IsMatch(factoryName, "^[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*$")) + { + throw new ValidationException(ValidationRules.Pattern, "factoryName", "^[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*$"); + } + } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } + // Tracing + bool _shouldTrace = ServiceClientTracing.IsEnabled; + string _invocationId = null; + if (_shouldTrace) + { + _invocationId = ServiceClientTracing.NextInvocationId.ToString(); + Dictionary tracingParameters = new Dictionary(); + tracingParameters.Add("resourceGroupName", resourceGroupName); + tracingParameters.Add("factoryName", factoryName); + tracingParameters.Add("cancellationToken", cancellationToken); + ServiceClientTracing.Enter(_invocationId, this, "ListByFactory", tracingParameters); + } + // Construct URL + var _baseUrl = Client.BaseUri.AbsoluteUri; + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/globalParameters").ToString(); + _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); + _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); + _url = _url.Replace("{factoryName}", System.Uri.EscapeDataString(factoryName)); + List _queryParameters = new List(); + if (Client.ApiVersion != null) + { + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); + } + if (_queryParameters.Count > 0) + { + _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters); + } + // Create HTTP transport objects + var _httpRequest = new HttpRequestMessage(); + HttpResponseMessage _httpResponse = null; + _httpRequest.Method = new HttpMethod("GET"); + _httpRequest.RequestUri = new System.Uri(_url); + // Set Headers + if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value) + { + _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString()); + } + if (Client.AcceptLanguage != null) + { + if (_httpRequest.Headers.Contains("accept-language")) + { + _httpRequest.Headers.Remove("accept-language"); + } + _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage); + } + + + if (customHeaders != null) + { + foreach(var _header in customHeaders) + { + if (_httpRequest.Headers.Contains(_header.Key)) + { + _httpRequest.Headers.Remove(_header.Key); + } + _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value); + } + } + + // Serialize Request + string _requestContent = null; + // Set Credentials + if (Client.Credentials != null) + { + cancellationToken.ThrowIfCancellationRequested(); + await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false); + } + // Send Request + if (_shouldTrace) + { + ServiceClientTracing.SendRequest(_invocationId, _httpRequest); + } + cancellationToken.ThrowIfCancellationRequested(); + _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false); + if (_shouldTrace) + { + ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse); + } + HttpStatusCode _statusCode = _httpResponse.StatusCode; + cancellationToken.ThrowIfCancellationRequested(); + string _responseContent = null; + if ((int)_statusCode != 200) + { + var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); + try + { + _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); + CloudError _errorBody = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); + if (_errorBody != null) + { + ex = new CloudException(_errorBody.Message); + ex.Body = _errorBody; + } + } + catch (JsonException) + { + // Ignore the exception + } + ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent); + ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent); + if (_httpResponse.Headers.Contains("x-ms-request-id")) + { + ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault(); + } + if (_shouldTrace) + { + ServiceClientTracing.Error(_invocationId, ex); + } + _httpRequest.Dispose(); + if (_httpResponse != null) + { + _httpResponse.Dispose(); + } + throw ex; + } + // Create Result + var _result = new AzureOperationResponse>(); + _result.Request = _httpRequest; + _result.Response = _httpResponse; + if (_httpResponse.Headers.Contains("x-ms-request-id")) + { + _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault(); + } + // Deserialize Response + if ((int)_statusCode == 200) + { + _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); + try + { + _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject>(_responseContent, Client.DeserializationSettings); + } + catch (JsonException ex) + { + _httpRequest.Dispose(); + if (_httpResponse != null) + { + _httpResponse.Dispose(); + } + throw new SerializationException("Unable to deserialize the response.", _responseContent, ex); + } + } + if (_shouldTrace) + { + ServiceClientTracing.Exit(_invocationId, _result); + } + return _result; + } + + /// + /// Gets a Global parameter + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The global parameter name. + /// + /// + /// Headers that will be added to request. + /// + /// + /// The cancellation token. + /// + /// + /// Thrown when the operation returned an invalid status code + /// + /// + /// Thrown when unable to deserialize the response + /// + /// + /// Thrown when a required parameter is null + /// + /// + /// Thrown when a required parameter is null + /// + /// + /// A response object containing the response body and response headers. + /// + public async Task> GetWithHttpMessagesAsync(string resourceGroupName, string factoryName, string globalParameterName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + { + if (Client.SubscriptionId == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); + } + if (resourceGroupName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName"); + } + if (resourceGroupName != null) + { + if (resourceGroupName.Length > 90) + { + throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90); + } + if (resourceGroupName.Length < 1) + { + throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1); + } + if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+$")) + { + throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+$"); + } + } + if (factoryName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "factoryName"); + } + if (factoryName != null) + { + if (factoryName.Length > 63) + { + throw new ValidationException(ValidationRules.MaxLength, "factoryName", 63); + } + if (factoryName.Length < 3) + { + throw new ValidationException(ValidationRules.MinLength, "factoryName", 3); + } + if (!System.Text.RegularExpressions.Regex.IsMatch(factoryName, "^[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*$")) + { + throw new ValidationException(ValidationRules.Pattern, "factoryName", "^[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*$"); + } + } + if (globalParameterName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "globalParameterName"); + } + if (globalParameterName != null) + { + if (globalParameterName.Length > 260) + { + throw new ValidationException(ValidationRules.MaxLength, "globalParameterName", 260); + } + if (globalParameterName.Length < 1) + { + throw new ValidationException(ValidationRules.MinLength, "globalParameterName", 1); + } + if (!System.Text.RegularExpressions.Regex.IsMatch(globalParameterName, "^[A-Za-z0-9_][^<>*#.%&:\\\\+?/]*$")) + { + throw new ValidationException(ValidationRules.Pattern, "globalParameterName", "^[A-Za-z0-9_][^<>*#.%&:\\\\+?/]*$"); + } + } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } + // Tracing + bool _shouldTrace = ServiceClientTracing.IsEnabled; + string _invocationId = null; + if (_shouldTrace) + { + _invocationId = ServiceClientTracing.NextInvocationId.ToString(); + Dictionary tracingParameters = new Dictionary(); + tracingParameters.Add("resourceGroupName", resourceGroupName); + tracingParameters.Add("factoryName", factoryName); + tracingParameters.Add("globalParameterName", globalParameterName); + tracingParameters.Add("cancellationToken", cancellationToken); + ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters); + } + // Construct URL + var _baseUrl = Client.BaseUri.AbsoluteUri; + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/globalParameters/{globalParameterName}").ToString(); + _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); + _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); + _url = _url.Replace("{factoryName}", System.Uri.EscapeDataString(factoryName)); + _url = _url.Replace("{globalParameterName}", System.Uri.EscapeDataString(globalParameterName)); + List _queryParameters = new List(); + if (Client.ApiVersion != null) + { + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); + } + if (_queryParameters.Count > 0) + { + _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters); + } + // Create HTTP transport objects + var _httpRequest = new HttpRequestMessage(); + HttpResponseMessage _httpResponse = null; + _httpRequest.Method = new HttpMethod("GET"); + _httpRequest.RequestUri = new System.Uri(_url); + // Set Headers + if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value) + { + _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString()); + } + if (Client.AcceptLanguage != null) + { + if (_httpRequest.Headers.Contains("accept-language")) + { + _httpRequest.Headers.Remove("accept-language"); + } + _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage); + } + + + if (customHeaders != null) + { + foreach(var _header in customHeaders) + { + if (_httpRequest.Headers.Contains(_header.Key)) + { + _httpRequest.Headers.Remove(_header.Key); + } + _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value); + } + } + + // Serialize Request + string _requestContent = null; + // Set Credentials + if (Client.Credentials != null) + { + cancellationToken.ThrowIfCancellationRequested(); + await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false); + } + // Send Request + if (_shouldTrace) + { + ServiceClientTracing.SendRequest(_invocationId, _httpRequest); + } + cancellationToken.ThrowIfCancellationRequested(); + _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false); + if (_shouldTrace) + { + ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse); + } + HttpStatusCode _statusCode = _httpResponse.StatusCode; + cancellationToken.ThrowIfCancellationRequested(); + string _responseContent = null; + if ((int)_statusCode != 200) + { + var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); + try + { + _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); + CloudError _errorBody = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); + if (_errorBody != null) + { + ex = new CloudException(_errorBody.Message); + ex.Body = _errorBody; + } + } + catch (JsonException) + { + // Ignore the exception + } + ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent); + ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent); + if (_httpResponse.Headers.Contains("x-ms-request-id")) + { + ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault(); + } + if (_shouldTrace) + { + ServiceClientTracing.Error(_invocationId, ex); + } + _httpRequest.Dispose(); + if (_httpResponse != null) + { + _httpResponse.Dispose(); + } + throw ex; + } + // Create Result + var _result = new AzureOperationResponse(); + _result.Request = _httpRequest; + _result.Response = _httpResponse; + if (_httpResponse.Headers.Contains("x-ms-request-id")) + { + _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault(); + } + // Deserialize Response + if ((int)_statusCode == 200) + { + _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); + try + { + _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); + } + catch (JsonException ex) + { + _httpRequest.Dispose(); + if (_httpResponse != null) + { + _httpResponse.Dispose(); + } + throw new SerializationException("Unable to deserialize the response.", _responseContent, ex); + } + } + if (_shouldTrace) + { + ServiceClientTracing.Exit(_invocationId, _result); + } + return _result; + } + + /// + /// Creates or updates a Global parameter + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The global parameter name. + /// + /// + /// Global parameter resource definition. + /// + /// + /// Headers that will be added to request. + /// + /// + /// The cancellation token. + /// + /// + /// Thrown when the operation returned an invalid status code + /// + /// + /// Thrown when unable to deserialize the response + /// + /// + /// Thrown when a required parameter is null + /// + /// + /// Thrown when a required parameter is null + /// + /// + /// A response object containing the response body and response headers. + /// + public async Task> CreateOrUpdateWithHttpMessagesAsync(string resourceGroupName, string factoryName, string globalParameterName, GlobalParameterResource defaultParameter, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + { + if (Client.SubscriptionId == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); + } + if (resourceGroupName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName"); + } + if (resourceGroupName != null) + { + if (resourceGroupName.Length > 90) + { + throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90); + } + if (resourceGroupName.Length < 1) + { + throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1); + } + if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+$")) + { + throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+$"); + } + } + if (factoryName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "factoryName"); + } + if (factoryName != null) + { + if (factoryName.Length > 63) + { + throw new ValidationException(ValidationRules.MaxLength, "factoryName", 63); + } + if (factoryName.Length < 3) + { + throw new ValidationException(ValidationRules.MinLength, "factoryName", 3); + } + if (!System.Text.RegularExpressions.Regex.IsMatch(factoryName, "^[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*$")) + { + throw new ValidationException(ValidationRules.Pattern, "factoryName", "^[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*$"); + } + } + if (globalParameterName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "globalParameterName"); + } + if (globalParameterName != null) + { + if (globalParameterName.Length > 260) + { + throw new ValidationException(ValidationRules.MaxLength, "globalParameterName", 260); + } + if (globalParameterName.Length < 1) + { + throw new ValidationException(ValidationRules.MinLength, "globalParameterName", 1); + } + if (!System.Text.RegularExpressions.Regex.IsMatch(globalParameterName, "^[A-Za-z0-9_][^<>*#.%&:\\\\+?/]*$")) + { + throw new ValidationException(ValidationRules.Pattern, "globalParameterName", "^[A-Za-z0-9_][^<>*#.%&:\\\\+?/]*$"); + } + } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } + if (defaultParameter == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "defaultParameter"); + } + if (defaultParameter != null) + { + defaultParameter.Validate(); + } + // Tracing + bool _shouldTrace = ServiceClientTracing.IsEnabled; + string _invocationId = null; + if (_shouldTrace) + { + _invocationId = ServiceClientTracing.NextInvocationId.ToString(); + Dictionary tracingParameters = new Dictionary(); + tracingParameters.Add("resourceGroupName", resourceGroupName); + tracingParameters.Add("factoryName", factoryName); + tracingParameters.Add("globalParameterName", globalParameterName); + tracingParameters.Add("defaultParameter", defaultParameter); + tracingParameters.Add("cancellationToken", cancellationToken); + ServiceClientTracing.Enter(_invocationId, this, "CreateOrUpdate", tracingParameters); + } + // Construct URL + var _baseUrl = Client.BaseUri.AbsoluteUri; + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/globalParameters/{globalParameterName}").ToString(); + _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); + _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); + _url = _url.Replace("{factoryName}", System.Uri.EscapeDataString(factoryName)); + _url = _url.Replace("{globalParameterName}", System.Uri.EscapeDataString(globalParameterName)); + List _queryParameters = new List(); + if (Client.ApiVersion != null) + { + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); + } + if (_queryParameters.Count > 0) + { + _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters); + } + // Create HTTP transport objects + var _httpRequest = new HttpRequestMessage(); + HttpResponseMessage _httpResponse = null; + _httpRequest.Method = new HttpMethod("PUT"); + _httpRequest.RequestUri = new System.Uri(_url); + // Set Headers + if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value) + { + _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString()); + } + if (Client.AcceptLanguage != null) + { + if (_httpRequest.Headers.Contains("accept-language")) + { + _httpRequest.Headers.Remove("accept-language"); + } + _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage); + } + + + if (customHeaders != null) + { + foreach(var _header in customHeaders) + { + if (_httpRequest.Headers.Contains(_header.Key)) + { + _httpRequest.Headers.Remove(_header.Key); + } + _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value); + } + } + + // Serialize Request + string _requestContent = null; + if(defaultParameter != null) + { + _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(defaultParameter, Client.SerializationSettings); + _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8); + _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8"); + } + // Set Credentials + if (Client.Credentials != null) + { + cancellationToken.ThrowIfCancellationRequested(); + await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false); + } + // Send Request + if (_shouldTrace) + { + ServiceClientTracing.SendRequest(_invocationId, _httpRequest); + } + cancellationToken.ThrowIfCancellationRequested(); + _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false); + if (_shouldTrace) + { + ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse); + } + HttpStatusCode _statusCode = _httpResponse.StatusCode; + cancellationToken.ThrowIfCancellationRequested(); + string _responseContent = null; + if ((int)_statusCode != 200) + { + var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); + try + { + _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); + CloudError _errorBody = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); + if (_errorBody != null) + { + ex = new CloudException(_errorBody.Message); + ex.Body = _errorBody; + } + } + catch (JsonException) + { + // Ignore the exception + } + ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent); + ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent); + if (_httpResponse.Headers.Contains("x-ms-request-id")) + { + ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault(); + } + if (_shouldTrace) + { + ServiceClientTracing.Error(_invocationId, ex); + } + _httpRequest.Dispose(); + if (_httpResponse != null) + { + _httpResponse.Dispose(); + } + throw ex; + } + // Create Result + var _result = new AzureOperationResponse(); + _result.Request = _httpRequest; + _result.Response = _httpResponse; + if (_httpResponse.Headers.Contains("x-ms-request-id")) + { + _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault(); + } + // Deserialize Response + if ((int)_statusCode == 200) + { + _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); + try + { + _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); + } + catch (JsonException ex) + { + _httpRequest.Dispose(); + if (_httpResponse != null) + { + _httpResponse.Dispose(); + } + throw new SerializationException("Unable to deserialize the response.", _responseContent, ex); + } + } + if (_shouldTrace) + { + ServiceClientTracing.Exit(_invocationId, _result); + } + return _result; + } + + /// + /// Deletes a Global parameter + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The global parameter name. + /// + /// + /// Headers that will be added to request. + /// + /// + /// The cancellation token. + /// + /// + /// Thrown when the operation returned an invalid status code + /// + /// + /// Thrown when a required parameter is null + /// + /// + /// Thrown when a required parameter is null + /// + /// + /// A response object containing the response body and response headers. + /// + public async Task DeleteWithHttpMessagesAsync(string resourceGroupName, string factoryName, string globalParameterName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + { + if (Client.SubscriptionId == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); + } + if (resourceGroupName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName"); + } + if (resourceGroupName != null) + { + if (resourceGroupName.Length > 90) + { + throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90); + } + if (resourceGroupName.Length < 1) + { + throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1); + } + if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+$")) + { + throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+$"); + } + } + if (factoryName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "factoryName"); + } + if (factoryName != null) + { + if (factoryName.Length > 63) + { + throw new ValidationException(ValidationRules.MaxLength, "factoryName", 63); + } + if (factoryName.Length < 3) + { + throw new ValidationException(ValidationRules.MinLength, "factoryName", 3); + } + if (!System.Text.RegularExpressions.Regex.IsMatch(factoryName, "^[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*$")) + { + throw new ValidationException(ValidationRules.Pattern, "factoryName", "^[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*$"); + } + } + if (globalParameterName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "globalParameterName"); + } + if (globalParameterName != null) + { + if (globalParameterName.Length > 260) + { + throw new ValidationException(ValidationRules.MaxLength, "globalParameterName", 260); + } + if (globalParameterName.Length < 1) + { + throw new ValidationException(ValidationRules.MinLength, "globalParameterName", 1); + } + if (!System.Text.RegularExpressions.Regex.IsMatch(globalParameterName, "^[A-Za-z0-9_][^<>*#.%&:\\\\+?/]*$")) + { + throw new ValidationException(ValidationRules.Pattern, "globalParameterName", "^[A-Za-z0-9_][^<>*#.%&:\\\\+?/]*$"); + } + } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } + // Tracing + bool _shouldTrace = ServiceClientTracing.IsEnabled; + string _invocationId = null; + if (_shouldTrace) + { + _invocationId = ServiceClientTracing.NextInvocationId.ToString(); + Dictionary tracingParameters = new Dictionary(); + tracingParameters.Add("resourceGroupName", resourceGroupName); + tracingParameters.Add("factoryName", factoryName); + tracingParameters.Add("globalParameterName", globalParameterName); + tracingParameters.Add("cancellationToken", cancellationToken); + ServiceClientTracing.Enter(_invocationId, this, "Delete", tracingParameters); + } + // Construct URL + var _baseUrl = Client.BaseUri.AbsoluteUri; + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/globalParameters/{globalParameterName}").ToString(); + _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); + _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); + _url = _url.Replace("{factoryName}", System.Uri.EscapeDataString(factoryName)); + _url = _url.Replace("{globalParameterName}", System.Uri.EscapeDataString(globalParameterName)); + List _queryParameters = new List(); + if (Client.ApiVersion != null) + { + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); + } + if (_queryParameters.Count > 0) + { + _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters); + } + // Create HTTP transport objects + var _httpRequest = new HttpRequestMessage(); + HttpResponseMessage _httpResponse = null; + _httpRequest.Method = new HttpMethod("DELETE"); + _httpRequest.RequestUri = new System.Uri(_url); + // Set Headers + if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value) + { + _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString()); + } + if (Client.AcceptLanguage != null) + { + if (_httpRequest.Headers.Contains("accept-language")) + { + _httpRequest.Headers.Remove("accept-language"); + } + _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage); + } + + + if (customHeaders != null) + { + foreach(var _header in customHeaders) + { + if (_httpRequest.Headers.Contains(_header.Key)) + { + _httpRequest.Headers.Remove(_header.Key); + } + _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value); + } + } + + // Serialize Request + string _requestContent = null; + // Set Credentials + if (Client.Credentials != null) + { + cancellationToken.ThrowIfCancellationRequested(); + await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false); + } + // Send Request + if (_shouldTrace) + { + ServiceClientTracing.SendRequest(_invocationId, _httpRequest); + } + cancellationToken.ThrowIfCancellationRequested(); + _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false); + if (_shouldTrace) + { + ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse); + } + HttpStatusCode _statusCode = _httpResponse.StatusCode; + cancellationToken.ThrowIfCancellationRequested(); + string _responseContent = null; + if ((int)_statusCode != 200 && (int)_statusCode != 204) + { + var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); + try + { + _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); + CloudError _errorBody = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); + if (_errorBody != null) + { + ex = new CloudException(_errorBody.Message); + ex.Body = _errorBody; + } + } + catch (JsonException) + { + // Ignore the exception + } + ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent); + ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent); + if (_httpResponse.Headers.Contains("x-ms-request-id")) + { + ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault(); + } + if (_shouldTrace) + { + ServiceClientTracing.Error(_invocationId, ex); + } + _httpRequest.Dispose(); + if (_httpResponse != null) + { + _httpResponse.Dispose(); + } + throw ex; + } + // Create Result + var _result = new AzureOperationResponse(); + _result.Request = _httpRequest; + _result.Response = _httpResponse; + if (_httpResponse.Headers.Contains("x-ms-request-id")) + { + _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault(); + } + if (_shouldTrace) + { + ServiceClientTracing.Exit(_invocationId, _result); + } + return _result; + } + + /// + /// Lists Global parameters + /// + /// + /// The NextLink from the previous successful call to List operation. + /// + /// + /// Headers that will be added to request. + /// + /// + /// The cancellation token. + /// + /// + /// Thrown when the operation returned an invalid status code + /// + /// + /// Thrown when unable to deserialize the response + /// + /// + /// Thrown when a required parameter is null + /// + /// + /// Thrown when a required parameter is null + /// + /// + /// A response object containing the response body and response headers. + /// + public async Task>> ListByFactoryNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + { + if (nextPageLink == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "nextPageLink"); + } + // Tracing + bool _shouldTrace = ServiceClientTracing.IsEnabled; + string _invocationId = null; + if (_shouldTrace) + { + _invocationId = ServiceClientTracing.NextInvocationId.ToString(); + Dictionary tracingParameters = new Dictionary(); + tracingParameters.Add("nextPageLink", nextPageLink); + tracingParameters.Add("cancellationToken", cancellationToken); + ServiceClientTracing.Enter(_invocationId, this, "ListByFactoryNext", tracingParameters); + } + // Construct URL + string _url = "{nextLink}"; + _url = _url.Replace("{nextLink}", nextPageLink); + List _queryParameters = new List(); + if (_queryParameters.Count > 0) + { + _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters); + } + // Create HTTP transport objects + var _httpRequest = new HttpRequestMessage(); + HttpResponseMessage _httpResponse = null; + _httpRequest.Method = new HttpMethod("GET"); + _httpRequest.RequestUri = new System.Uri(_url); + // Set Headers + if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value) + { + _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString()); + } + if (Client.AcceptLanguage != null) + { + if (_httpRequest.Headers.Contains("accept-language")) + { + _httpRequest.Headers.Remove("accept-language"); + } + _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage); + } + + + if (customHeaders != null) + { + foreach(var _header in customHeaders) + { + if (_httpRequest.Headers.Contains(_header.Key)) + { + _httpRequest.Headers.Remove(_header.Key); + } + _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value); + } + } + + // Serialize Request + string _requestContent = null; + // Set Credentials + if (Client.Credentials != null) + { + cancellationToken.ThrowIfCancellationRequested(); + await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false); + } + // Send Request + if (_shouldTrace) + { + ServiceClientTracing.SendRequest(_invocationId, _httpRequest); + } + cancellationToken.ThrowIfCancellationRequested(); + _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false); + if (_shouldTrace) + { + ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse); + } + HttpStatusCode _statusCode = _httpResponse.StatusCode; + cancellationToken.ThrowIfCancellationRequested(); + string _responseContent = null; + if ((int)_statusCode != 200) + { + var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); + try + { + _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); + CloudError _errorBody = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); + if (_errorBody != null) + { + ex = new CloudException(_errorBody.Message); + ex.Body = _errorBody; + } + } + catch (JsonException) + { + // Ignore the exception + } + ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent); + ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent); + if (_httpResponse.Headers.Contains("x-ms-request-id")) + { + ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault(); + } + if (_shouldTrace) + { + ServiceClientTracing.Error(_invocationId, ex); + } + _httpRequest.Dispose(); + if (_httpResponse != null) + { + _httpResponse.Dispose(); + } + throw ex; + } + // Create Result + var _result = new AzureOperationResponse>(); + _result.Request = _httpRequest; + _result.Response = _httpResponse; + if (_httpResponse.Headers.Contains("x-ms-request-id")) + { + _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault(); + } + // Deserialize Response + if ((int)_statusCode == 200) + { + _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); + try + { + _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject>(_responseContent, Client.DeserializationSettings); + } + catch (JsonException ex) + { + _httpRequest.Dispose(); + if (_httpResponse != null) + { + _httpResponse.Dispose(); + } + throw new SerializationException("Unable to deserialize the response.", _responseContent, ex); + } + } + if (_shouldTrace) + { + ServiceClientTracing.Exit(_invocationId, _result); + } + return _result; + } + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/GlobalParametersOperationsExtensions.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/GlobalParametersOperationsExtensions.cs new file mode 100644 index 0000000000000..003865ed33f51 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/GlobalParametersOperationsExtensions.cs @@ -0,0 +1,240 @@ +// +// 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 +{ + using Microsoft.Rest; + using Microsoft.Rest.Azure; + using Models; + using System.Threading; + using System.Threading.Tasks; + + /// + /// Extension methods for GlobalParametersOperations. + /// + public static partial class GlobalParametersOperationsExtensions + { + /// + /// Lists Global parameters + /// + /// + /// The operations group for this extension method. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + public static IPage ListByFactory(this IGlobalParametersOperations operations, string resourceGroupName, string factoryName) + { + return operations.ListByFactoryAsync(resourceGroupName, factoryName).GetAwaiter().GetResult(); + } + + /// + /// Lists Global parameters + /// + /// + /// The operations group for this extension method. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The cancellation token. + /// + public static async Task> ListByFactoryAsync(this IGlobalParametersOperations operations, string resourceGroupName, string factoryName, CancellationToken cancellationToken = default(CancellationToken)) + { + using (var _result = await operations.ListByFactoryWithHttpMessagesAsync(resourceGroupName, factoryName, null, cancellationToken).ConfigureAwait(false)) + { + return _result.Body; + } + } + + /// + /// Gets a Global parameter + /// + /// + /// The operations group for this extension method. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The global parameter name. + /// + public static GlobalParameterResource Get(this IGlobalParametersOperations operations, string resourceGroupName, string factoryName, string globalParameterName) + { + return operations.GetAsync(resourceGroupName, factoryName, globalParameterName).GetAwaiter().GetResult(); + } + + /// + /// Gets a Global parameter + /// + /// + /// The operations group for this extension method. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The global parameter name. + /// + /// + /// The cancellation token. + /// + public static async Task GetAsync(this IGlobalParametersOperations operations, string resourceGroupName, string factoryName, string globalParameterName, CancellationToken cancellationToken = default(CancellationToken)) + { + using (var _result = await operations.GetWithHttpMessagesAsync(resourceGroupName, factoryName, globalParameterName, null, cancellationToken).ConfigureAwait(false)) + { + return _result.Body; + } + } + + /// + /// Creates or updates a Global parameter + /// + /// + /// The operations group for this extension method. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The global parameter name. + /// + /// + /// Global parameter resource definition. + /// + public static GlobalParameterResource CreateOrUpdate(this IGlobalParametersOperations operations, string resourceGroupName, string factoryName, string globalParameterName, GlobalParameterResource defaultParameter) + { + return operations.CreateOrUpdateAsync(resourceGroupName, factoryName, globalParameterName, defaultParameter).GetAwaiter().GetResult(); + } + + /// + /// Creates or updates a Global parameter + /// + /// + /// The operations group for this extension method. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The global parameter name. + /// + /// + /// Global parameter resource definition. + /// + /// + /// The cancellation token. + /// + public static async Task CreateOrUpdateAsync(this IGlobalParametersOperations operations, string resourceGroupName, string factoryName, string globalParameterName, GlobalParameterResource defaultParameter, CancellationToken cancellationToken = default(CancellationToken)) + { + using (var _result = await operations.CreateOrUpdateWithHttpMessagesAsync(resourceGroupName, factoryName, globalParameterName, defaultParameter, null, cancellationToken).ConfigureAwait(false)) + { + return _result.Body; + } + } + + /// + /// Deletes a Global parameter + /// + /// + /// The operations group for this extension method. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The global parameter name. + /// + public static void Delete(this IGlobalParametersOperations operations, string resourceGroupName, string factoryName, string globalParameterName) + { + operations.DeleteAsync(resourceGroupName, factoryName, globalParameterName).GetAwaiter().GetResult(); + } + + /// + /// Deletes a Global parameter + /// + /// + /// The operations group for this extension method. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The global parameter name. + /// + /// + /// The cancellation token. + /// + public static async Task DeleteAsync(this IGlobalParametersOperations operations, string resourceGroupName, string factoryName, string globalParameterName, CancellationToken cancellationToken = default(CancellationToken)) + { + (await operations.DeleteWithHttpMessagesAsync(resourceGroupName, factoryName, globalParameterName, null, cancellationToken).ConfigureAwait(false)).Dispose(); + } + + /// + /// Lists Global parameters + /// + /// + /// The operations group for this extension method. + /// + /// + /// The NextLink from the previous successful call to List operation. + /// + public static IPage ListByFactoryNext(this IGlobalParametersOperations operations, string nextPageLink) + { + return operations.ListByFactoryNextAsync(nextPageLink).GetAwaiter().GetResult(); + } + + /// + /// Lists Global parameters + /// + /// + /// The operations group for this extension method. + /// + /// + /// The NextLink from the previous successful call to List operation. + /// + /// + /// The cancellation token. + /// + public static async Task> ListByFactoryNextAsync(this IGlobalParametersOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken)) + { + using (var _result = await operations.ListByFactoryNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false)) + { + return _result.Body; + } + } + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/IDataFactoryManagementClient.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/IDataFactoryManagementClient.cs index 70522539d77c2..b8afecb531e5c 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/IDataFactoryManagementClient.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/IDataFactoryManagementClient.cs @@ -170,5 +170,10 @@ public partial interface IDataFactoryManagementClient : System.IDisposable /// IPrivateLinkResourcesOperations PrivateLinkResources { get; } + /// + /// Gets the IGlobalParametersOperations. + /// + IGlobalParametersOperations GlobalParameters { get; } + } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/IGlobalParametersOperations.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/IGlobalParametersOperations.cs new file mode 100644 index 0000000000000..002e3b8562bc4 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/IGlobalParametersOperations.cs @@ -0,0 +1,158 @@ +// +// 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 +{ + using Microsoft.Rest; + using Microsoft.Rest.Azure; + using Models; + using System.Collections; + using System.Collections.Generic; + using System.Threading; + using System.Threading.Tasks; + + /// + /// GlobalParametersOperations operations. + /// + public partial interface IGlobalParametersOperations + { + /// + /// Lists Global parameters + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The headers that will be added to request. + /// + /// + /// The cancellation token. + /// + /// + /// Thrown when the operation returned an invalid status code + /// + /// + /// Thrown when unable to deserialize the response + /// + /// + /// Thrown when a required parameter is null + /// + Task>> ListByFactoryWithHttpMessagesAsync(string resourceGroupName, string factoryName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + /// + /// Gets a Global parameter + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The global parameter name. + /// + /// + /// The headers that will be added to request. + /// + /// + /// The cancellation token. + /// + /// + /// Thrown when the operation returned an invalid status code + /// + /// + /// Thrown when unable to deserialize the response + /// + /// + /// Thrown when a required parameter is null + /// + Task> GetWithHttpMessagesAsync(string resourceGroupName, string factoryName, string globalParameterName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + /// + /// Creates or updates a Global parameter + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The global parameter name. + /// + /// + /// Global parameter resource definition. + /// + /// + /// The headers that will be added to request. + /// + /// + /// The cancellation token. + /// + /// + /// Thrown when the operation returned an invalid status code + /// + /// + /// Thrown when unable to deserialize the response + /// + /// + /// Thrown when a required parameter is null + /// + Task> CreateOrUpdateWithHttpMessagesAsync(string resourceGroupName, string factoryName, string globalParameterName, GlobalParameterResource defaultParameter, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + /// + /// Deletes a Global parameter + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The global parameter name. + /// + /// + /// The headers that will be added to request. + /// + /// + /// The cancellation token. + /// + /// + /// Thrown when the operation returned an invalid status code + /// + /// + /// Thrown when a required parameter is null + /// + Task DeleteWithHttpMessagesAsync(string resourceGroupName, string factoryName, string globalParameterName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + /// + /// Lists Global parameters + /// + /// + /// The NextLink from the previous successful call to List operation. + /// + /// + /// The headers that will be added to request. + /// + /// + /// The cancellation token. + /// + /// + /// Thrown when the operation returned an invalid status code + /// + /// + /// Thrown when unable to deserialize the response + /// + /// + /// Thrown when a required parameter is null + /// + Task>> ListByFactoryNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DataFlowSink.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DataFlowSink.cs index ceb47cbb9b97c..9559f1c4027be 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DataFlowSink.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DataFlowSink.cs @@ -36,10 +36,13 @@ public DataFlowSink() /// Flowlet Reference /// Schema linked service /// reference. - public DataFlowSink(string name, string description = default(string), DatasetReference dataset = default(DatasetReference), LinkedServiceReference linkedService = default(LinkedServiceReference), DataFlowReference flowlet = default(DataFlowReference), LinkedServiceReference schemaLinkedService = default(LinkedServiceReference)) + /// Rejected data linked + /// service reference. + public DataFlowSink(string name, string description = default(string), DatasetReference dataset = default(DatasetReference), LinkedServiceReference linkedService = default(LinkedServiceReference), DataFlowReference flowlet = default(DataFlowReference), LinkedServiceReference schemaLinkedService = default(LinkedServiceReference), LinkedServiceReference rejectedDataLinkedService = default(LinkedServiceReference)) : base(name, description, dataset, linkedService, flowlet) { SchemaLinkedService = schemaLinkedService; + RejectedDataLinkedService = rejectedDataLinkedService; CustomInit(); } @@ -54,6 +57,12 @@ public DataFlowSink() [JsonProperty(PropertyName = "schemaLinkedService")] public LinkedServiceReference SchemaLinkedService { get; set; } + /// + /// Gets or sets rejected data linked service reference. + /// + [JsonProperty(PropertyName = "rejectedDataLinkedService")] + public LinkedServiceReference RejectedDataLinkedService { get; set; } + /// /// Validate the object. /// @@ -67,6 +76,10 @@ public override void Validate() { SchemaLinkedService.Validate(); } + if (RejectedDataLinkedService != null) + { + RejectedDataLinkedService.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExecuteDataFlowActivity.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExecuteDataFlowActivity.cs index 89e58fed41961..162b7d0f15b7a 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExecuteDataFlowActivity.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExecuteDataFlowActivity.cs @@ -62,7 +62,10 @@ public ExecuteDataFlowActivity() /// flow execution. Allows sinks with the same save order to be /// processed concurrently. Type: boolean (or Expression with /// resultType boolean) - public ExecuteDataFlowActivity(string name, DataFlowReference dataFlow, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), LinkedServiceReference linkedServiceName = default(LinkedServiceReference), ActivityPolicy policy = default(ActivityPolicy), DataFlowStagingInfo staging = default(DataFlowStagingInfo), IntegrationRuntimeReference integrationRuntime = default(IntegrationRuntimeReference), ExecuteDataFlowActivityTypePropertiesCompute compute = default(ExecuteDataFlowActivityTypePropertiesCompute), object traceLevel = default(object), object continueOnError = default(object), object runConcurrently = default(object)) + /// Specify number of parallel + /// staging for sources applicable to the sink. Type: integer (or + /// Expression with resultType integer) + public ExecuteDataFlowActivity(string name, DataFlowReference dataFlow, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), LinkedServiceReference linkedServiceName = default(LinkedServiceReference), ActivityPolicy policy = default(ActivityPolicy), DataFlowStagingInfo staging = default(DataFlowStagingInfo), IntegrationRuntimeReference integrationRuntime = default(IntegrationRuntimeReference), ExecuteDataFlowActivityTypePropertiesCompute compute = default(ExecuteDataFlowActivityTypePropertiesCompute), object traceLevel = default(object), object continueOnError = default(object), object runConcurrently = default(object), object sourceStagingConcurrency = default(object)) : base(name, additionalProperties, description, dependsOn, userProperties, linkedServiceName, policy) { DataFlow = dataFlow; @@ -72,6 +75,7 @@ public ExecuteDataFlowActivity() TraceLevel = traceLevel; ContinueOnError = continueOnError; RunConcurrently = runConcurrently; + SourceStagingConcurrency = sourceStagingConcurrency; CustomInit(); } @@ -128,6 +132,14 @@ public ExecuteDataFlowActivity() [JsonProperty(PropertyName = "typeProperties.runConcurrently")] public object RunConcurrently { get; set; } + /// + /// Gets or sets specify number of parallel staging for sources + /// applicable to the sink. Type: integer (or Expression with + /// resultType integer) + /// + [JsonProperty(PropertyName = "typeProperties.sourceStagingConcurrency")] + public object SourceStagingConcurrency { get; set; } + /// /// Validate the object. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExecuteWranglingDataflowActivity.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExecuteWranglingDataflowActivity.cs index 3025552c5ede5..c90b4d8ab7432 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExecuteWranglingDataflowActivity.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ExecuteWranglingDataflowActivity.cs @@ -62,12 +62,15 @@ public ExecuteWranglingDataflowActivity() /// flow execution. Allows sinks with the same save order to be /// processed concurrently. Type: boolean (or Expression with /// resultType boolean) + /// Specify number of parallel + /// staging for sources applicable to the sink. Type: integer (or + /// Expression with resultType integer) /// (Deprecated. Please use Queries). List of Power /// Query activity sinks mapped to a queryName. /// List of mapping for Power Query mashup query /// to sink dataset(s). /// Activity policy. - public ExecuteWranglingDataflowActivity(string name, DataFlowReference dataFlow, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), DataFlowStagingInfo staging = default(DataFlowStagingInfo), IntegrationRuntimeReference integrationRuntime = default(IntegrationRuntimeReference), ExecuteDataFlowActivityTypePropertiesCompute compute = default(ExecuteDataFlowActivityTypePropertiesCompute), object traceLevel = default(object), object continueOnError = default(object), object runConcurrently = default(object), IDictionary sinks = default(IDictionary), IList queries = default(IList), ActivityPolicy policy = default(ActivityPolicy)) + public ExecuteWranglingDataflowActivity(string name, DataFlowReference dataFlow, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), DataFlowStagingInfo staging = default(DataFlowStagingInfo), IntegrationRuntimeReference integrationRuntime = default(IntegrationRuntimeReference), ExecuteDataFlowActivityTypePropertiesCompute compute = default(ExecuteDataFlowActivityTypePropertiesCompute), object traceLevel = default(object), object continueOnError = default(object), object runConcurrently = default(object), object sourceStagingConcurrency = default(object), IDictionary sinks = default(IDictionary), IList queries = default(IList), ActivityPolicy policy = default(ActivityPolicy)) : base(name, additionalProperties, description, dependsOn, userProperties) { DataFlow = dataFlow; @@ -77,6 +80,7 @@ public ExecuteWranglingDataflowActivity() TraceLevel = traceLevel; ContinueOnError = continueOnError; RunConcurrently = runConcurrently; + SourceStagingConcurrency = sourceStagingConcurrency; Sinks = sinks; Queries = queries; Policy = policy; @@ -136,6 +140,14 @@ public ExecuteWranglingDataflowActivity() [JsonProperty(PropertyName = "typeProperties.runConcurrently")] public object RunConcurrently { get; set; } + /// + /// Gets or sets specify number of parallel staging for sources + /// applicable to the sink. Type: integer (or Expression with + /// resultType integer) + /// + [JsonProperty(PropertyName = "typeProperties.sourceStagingConcurrency")] + public object SourceStagingConcurrency { get; set; } + /// /// Gets or sets (Deprecated. Please use Queries). List of Power Query /// activity sinks mapped to a queryName. diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Factory.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Factory.cs index e96b57ac1009f..ea41b3d8aa650 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Factory.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Factory.cs @@ -49,6 +49,8 @@ public Factory() /// Time the factory was created in ISO8601 /// format. /// Version of the factory. + /// Purview information of the + /// factory. /// Git repo information of the /// factory. /// List of parameters for @@ -58,7 +60,7 @@ public Factory() /// Whether or not public network /// access is allowed for the data factory. Possible values include: /// 'Enabled', 'Disabled' - public Factory(string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary tags = default(IDictionary), string eTag = default(string), IDictionary additionalProperties = default(IDictionary), FactoryIdentity identity = default(FactoryIdentity), string provisioningState = default(string), System.DateTime? createTime = default(System.DateTime?), string version = default(string), FactoryRepoConfiguration repoConfiguration = default(FactoryRepoConfiguration), IDictionary globalParameters = default(IDictionary), EncryptionConfiguration encryption = default(EncryptionConfiguration), string publicNetworkAccess = default(string)) + public Factory(string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary tags = default(IDictionary), string eTag = default(string), IDictionary additionalProperties = default(IDictionary), FactoryIdentity identity = default(FactoryIdentity), string provisioningState = default(string), System.DateTime? createTime = default(System.DateTime?), string version = default(string), PurviewConfiguration purviewConfiguration = default(PurviewConfiguration), FactoryRepoConfiguration repoConfiguration = default(FactoryRepoConfiguration), IDictionary globalParameters = default(IDictionary), EncryptionConfiguration encryption = default(EncryptionConfiguration), string publicNetworkAccess = default(string)) : base(id, name, type, location, tags, eTag) { AdditionalProperties = additionalProperties; @@ -66,6 +68,7 @@ public Factory() ProvisioningState = provisioningState; CreateTime = createTime; Version = version; + PurviewConfiguration = purviewConfiguration; RepoConfiguration = repoConfiguration; GlobalParameters = globalParameters; Encryption = encryption; @@ -109,6 +112,12 @@ public Factory() [JsonProperty(PropertyName = "properties.version")] public string Version { get; private set; } + /// + /// Gets or sets purview information of the factory. + /// + [JsonProperty(PropertyName = "properties.purviewConfiguration")] + public PurviewConfiguration PurviewConfiguration { get; set; } + /// /// Gets or sets git repo information of the factory. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GlobalParameterResource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GlobalParameterResource.cs new file mode 100644 index 0000000000000..0040326aeabb4 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GlobalParameterResource.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.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// Global parameters resource type. + /// + public partial class GlobalParameterResource : SubResource + { + /// + /// Initializes a new instance of the GlobalParameterResource class. + /// + public GlobalParameterResource() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the GlobalParameterResource class. + /// + /// Properties of the global + /// parameter. + /// The resource identifier. + /// The resource name. + /// The resource type. + /// Etag identifies change in the resource. + public GlobalParameterResource(IDictionary properties, string id = default(string), string name = default(string), string type = default(string), string etag = default(string)) + : base(id, name, type, etag) + { + Properties = properties; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets properties of the global parameter. + /// + [JsonProperty(PropertyName = "properties")] + public IDictionary Properties { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (Properties == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "Properties"); + } + if (Properties != null) + { + foreach (var valueElement in Properties.Values) + { + if (valueElement != null) + { + valueElement.Validate(); + } + } + } + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PowerQuerySink.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PowerQuerySink.cs index 849907231ece6..d03685242e017 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PowerQuerySink.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PowerQuerySink.cs @@ -36,9 +36,11 @@ public PowerQuerySink() /// Flowlet Reference /// Schema linked service /// reference. + /// Rejected data linked + /// service reference. /// sink script. - public PowerQuerySink(string name, string description = default(string), DatasetReference dataset = default(DatasetReference), LinkedServiceReference linkedService = default(LinkedServiceReference), DataFlowReference flowlet = default(DataFlowReference), LinkedServiceReference schemaLinkedService = default(LinkedServiceReference), string script = default(string)) - : base(name, description, dataset, linkedService, flowlet, schemaLinkedService) + public PowerQuerySink(string name, string description = default(string), DatasetReference dataset = default(DatasetReference), LinkedServiceReference linkedService = default(LinkedServiceReference), DataFlowReference flowlet = default(DataFlowReference), LinkedServiceReference schemaLinkedService = default(LinkedServiceReference), LinkedServiceReference rejectedDataLinkedService = default(LinkedServiceReference), string script = default(string)) + : base(name, description, dataset, linkedService, flowlet, schemaLinkedService, rejectedDataLinkedService) { Script = script; CustomInit(); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PurviewConfiguration.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PurviewConfiguration.cs new file mode 100644 index 0000000000000..80ddb128fca3a --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PurviewConfiguration.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; + + /// + /// Purview configuration. + /// + public partial class PurviewConfiguration + { + /// + /// Initializes a new instance of the PurviewConfiguration class. + /// + public PurviewConfiguration() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the PurviewConfiguration class. + /// + /// Purview resource id. + public PurviewConfiguration(string purviewResourceId = default(string)) + { + PurviewResourceId = purviewResourceId; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets purview resource id. + /// + [JsonProperty(PropertyName = "purviewResourceId")] + public string PurviewResourceId { get; set; } + + } +} 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 7fa0078207649..717affd1dab8a 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,15 @@ 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.1.0 + 6.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 952a88018607f..b5d3283f55326 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs @@ -7,7 +7,7 @@ [assembly: AssemblyTitle("Microsoft Azure Data Factory Management Library")] [assembly: AssemblyDescription("Provides management functionality for Microsoft Azure Data Factory Resources.")] [assembly: AssemblyVersion("6.0.0.0")] -[assembly: AssemblyFileVersion("6.1.0.0")] +[assembly: AssemblyFileVersion("6.2.0.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] [assembly: AssemblyProduct("Microsoft Azure .NET SDK")] From a8dfb9803ba949ad756fda47873ff65230d2bd60 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Mon, 23 May 2022 16:04:32 +0800 Subject: [PATCH 12/15] fix a build issue --- .../src/Customizations/Factory.cs | 49 ------------------- 1 file changed, 49 deletions(-) delete mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/Factory.cs diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/Factory.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/Factory.cs deleted file mode 100644 index 25b441d8dfd3d..0000000000000 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/Factory.cs +++ /dev/null @@ -1,49 +0,0 @@ -using System.Collections.Generic; - -namespace Microsoft.Azure.Management.DataFactory.Models -{ - public partial class Factory : Resource - { - /// - /// Initializes a new instance of the Factory class. - /// - /// The resource identifier. - /// The resource name. - /// The resource type. - /// The resource location. - /// The resource tags. - /// Etag identifies change in the resource. - /// Unmatched properties from the - /// message are deserialized this collection - /// Managed service identity of the - /// factory. - /// Factory provisioning state, example - /// Succeeded. - /// Time the factory was created in ISO8601 - /// format. - /// Version of the factory. - /// Git repo information of the - /// factory. - /// List of parameters for - /// factory. - /// Properties to enable Customer Managed Key - /// for the factory. - /// Whether or not public network - /// access is allowed for the data factory. Possible values include: - /// 'Enabled', 'Disabled' - public Factory(string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary tags = default(IDictionary), string eTag = default(string), IDictionary additionalProperties = default(IDictionary), FactoryIdentity identity = default(FactoryIdentity), string provisioningState = default(string), System.DateTime? createTime = default(System.DateTime?), string version = default(string), FactoryRepoConfiguration repoConfiguration = default(FactoryRepoConfiguration), IDictionary globalParameters = default(IDictionary), EncryptionConfiguration encryption = default(EncryptionConfiguration), string publicNetworkAccess = default(string)) - : base(id, name, type, location, tags, eTag) - { - AdditionalProperties = additionalProperties; - Identity = identity; - ProvisioningState = provisioningState; - CreateTime = createTime; - Version = version; - RepoConfiguration = repoConfiguration; - GlobalParameters = globalParameters; - Encryption = encryption; - PublicNetworkAccess = publicNetworkAccess; - CustomInit(); - } - } -} From bcc13f02169e4f1351292aa9cc4afa9ac73993f5 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Mon, 23 May 2022 17:29:12 +0800 Subject: [PATCH 13/15] update --- .../src/Customizations/Factory.cs | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/Factory.cs diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/Factory.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/Factory.cs new file mode 100644 index 0000000000000..12c6c22b1b65f --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/Factory.cs @@ -0,0 +1,49 @@ +using System.Collections.Generic; + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + public partial class Factory : Resource + { + /// + /// Initializes a new instance of the Factory class. + /// + /// The resource identifier. + /// The resource name. + /// The resource type. + /// The resource location. + /// The resource tags. + /// Etag identifies change in the resource. + /// Unmatched properties from the + /// message are deserialized this collection + /// Managed service identity of the + /// factory. + /// Factory provisioning state, example + /// Succeeded. + /// Time the factory was created in ISO8601 + /// format. + /// Version of the factory. + /// Git repo information of the + /// factory. + /// List of parameters for + /// factory. + /// Properties to enable Customer Managed Key + /// for the factory. + /// Whether or not public network + /// access is allowed for the data factory. Possible values include: + /// 'Enabled', 'Disabled' + public Factory(string id, string name, string type, string location, IDictionary tags, string eTag, IDictionary additionalProperties, FactoryIdentity identity, string provisioningState, System.DateTime? createTime, string version, FactoryRepoConfiguration repoConfiguration, IDictionary globalParameters, EncryptionConfiguration encryption, string publicNetworkAccess) + : base(id, name, type, location, tags, eTag) + { + AdditionalProperties = additionalProperties; + Identity = identity; + ProvisioningState = provisioningState; + CreateTime = createTime; + Version = version; + RepoConfiguration = repoConfiguration; + GlobalParameters = globalParameters; + Encryption = encryption; + PublicNetworkAccess = publicNetworkAccess; + CustomInit(); + } + } +} From e7525ace21adc4a508a78979c284f1233e56c68f Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Tue, 24 May 2022 14:28:48 +0800 Subject: [PATCH 14/15] update for comments --- .../src/Customizations/ExecuteWranglingDataflowActivity.cs | 2 +- .../src/Customizations/Factory.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/ExecuteWranglingDataflowActivity.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/ExecuteWranglingDataflowActivity.cs index 6a162164be31f..9ec55790fa693 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/ExecuteWranglingDataflowActivity.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/ExecuteWranglingDataflowActivity.cs @@ -37,7 +37,7 @@ public partial class ExecuteWranglingDataflowActivity : Activity /// List of mapping for Power Query mashup query /// to sink dataset(s). /// Activity policy. - public ExecuteWranglingDataflowActivity(string name, DataFlowReference dataFlow, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), DataFlowStagingInfo staging = default(DataFlowStagingInfo), IntegrationRuntimeReference integrationRuntime = default(IntegrationRuntimeReference), ExecuteDataFlowActivityTypePropertiesCompute compute = default(ExecuteDataFlowActivityTypePropertiesCompute), object traceLevel = default(object), object continueOnError = default(object), object runConcurrently = default(object), IDictionary sinks = default(IDictionary), IList queries = default(IList), ActivityPolicy policy = default(ActivityPolicy)) + public ExecuteWranglingDataflowActivity(string name, DataFlowReference dataFlow, IDictionary additionalProperties, string description, IList dependsOn, IList userProperties, DataFlowStagingInfo staging, IntegrationRuntimeReference integrationRuntime, ExecuteDataFlowActivityTypePropertiesCompute compute, object traceLevel, object continueOnError, object runConcurrently, IDictionary sinks, IList queries = default(IList), ActivityPolicy policy = default(ActivityPolicy)) : base(name, additionalProperties, description, dependsOn, userProperties) { DataFlow = dataFlow; diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/Factory.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/Factory.cs index 12c6c22b1b65f..96c4e3265f43a 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/Factory.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/Factory.cs @@ -31,8 +31,8 @@ public partial class Factory : Resource /// Whether or not public network /// access is allowed for the data factory. Possible values include: /// 'Enabled', 'Disabled' - public Factory(string id, string name, string type, string location, IDictionary tags, string eTag, IDictionary additionalProperties, FactoryIdentity identity, string provisioningState, System.DateTime? createTime, string version, FactoryRepoConfiguration repoConfiguration, IDictionary globalParameters, EncryptionConfiguration encryption, string publicNetworkAccess) - : base(id, name, type, location, tags, eTag) + public Factory(string id, string name, string type, string location, IDictionary tags, string eTag, IDictionary additionalProperties, FactoryIdentity identity, string provisioningState, System.DateTime? createTime, string version, FactoryRepoConfiguration repoConfiguration, IDictionary globalParameters = default(IDictionary), EncryptionConfiguration encryption = default(EncryptionConfiguration), string publicNetworkAccess = default(string)) + : base(id, name, type, location, tags, eTag) { AdditionalProperties = additionalProperties; Identity = identity; From 53c8b8342a117ab2bec097c0dfb826c85417acca Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Tue, 14 Jun 2022 08:34:34 +0800 Subject: [PATCH 15/15] [DataFactory]Added new features into 6.3.0 --- .../datafactory_resource-manager.txt | 4 +- .../src/CHANGELOG.md | 6 + .../Models/FactoryGitHubConfiguration.cs | 4 +- .../Models/RestServiceAuthenticationType.cs | 1 + .../Models/RestServiceLinkedService.cs | 64 ++++- .../Generated/Models/SapOdpLinkedService.cs | 271 ++++++++++++++++++ .../Generated/Models/SapOdpResourceDataset.cs | 104 +++++++ .../src/Generated/Models/SapOdpSource.cs | 112 ++++++++ ...rosoft.Azure.Management.DataFactory.csproj | 9 +- .../src/Properties/AssemblyInfo.cs | 2 +- .../JsonSamples/LinkedServiceJsonSamples.cs | 22 ++ 11 files changed, 586 insertions(+), 13 deletions(-) create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapOdpLinkedService.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapOdpResourceDataset.cs create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapOdpSource.cs diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt index 463ac08f23a1d..a4f0dca782557 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-05-23 02:58:44 UTC +2022-06-14 00:17:03 UTC Azure-rest-api-specs repository information GitHub fork: Azure Branch: main -Commit: d916ae110aa385d49cd24787a05611345696644b +Commit: de400f7204d30d25543ac967636180728d52a88f 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 b9324a5ded6c5..c6bef5e48f5fc 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog for the Azure Data Factory V2 .NET SDK +## Version 6.3.0 +### Feature Additions +- Changed FactoryGitHubConfiguration url format for hostName description +- Added SAP ODP connector in ADF +- Added support OAuth2ClientCredential auth in RestSevice + ## Version 6.2.0 ### Feature Additions - Added globalParameters apis into ADF diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryGitHubConfiguration.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryGitHubConfiguration.cs index 37f563160f92c..8722faac6464e 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryGitHubConfiguration.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryGitHubConfiguration.cs @@ -35,7 +35,7 @@ public FactoryGitHubConfiguration() /// Root folder. /// Last commit id. /// GitHub Enterprise host name. For example: - /// https://github.mydomain.com + /// `https://github.mydomain.com` /// GitHub bring your own app client id. /// GitHub bring your own app client secret /// information. @@ -55,7 +55,7 @@ public FactoryGitHubConfiguration() /// /// Gets or sets gitHub Enterprise host name. For example: - /// https://github.mydomain.com + /// `https://github.mydomain.com` /// [JsonProperty(PropertyName = "hostName")] public string HostName { get; set; } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RestServiceAuthenticationType.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RestServiceAuthenticationType.cs index 28c096262569c..507bb90f19c5b 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RestServiceAuthenticationType.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RestServiceAuthenticationType.cs @@ -20,5 +20,6 @@ public static class RestServiceAuthenticationType public const string Basic = "Basic"; public const string AadServicePrincipal = "AadServicePrincipal"; public const string ManagedServiceIdentity = "ManagedServiceIdentity"; + public const string OAuth2ClientCredential = "OAuth2ClientCredential"; } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RestServiceLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RestServiceLinkedService.cs index 189c59e656fbd..416e740ea1b1c 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RestServiceLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RestServiceLinkedService.cs @@ -38,7 +38,8 @@ public RestServiceLinkedService() /// The base URL of the REST service. /// Type of authentication used to /// connect to the REST service. Possible values include: 'Anonymous', - /// 'Basic', 'AadServicePrincipal', 'ManagedServiceIdentity' + /// 'Basic', 'AadServicePrincipal', 'ManagedServiceIdentity', + /// 'OAuth2ClientCredential' /// Unmatched properties from the /// message are deserialized this collection /// The integration runtime reference. @@ -77,7 +78,21 @@ public RestServiceLinkedService() /// resultType string). /// The credential reference containing /// authentication information. - public RestServiceLinkedService(object url, string authenticationType, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object enableServerCertificateValidation = default(object), object userName = default(object), SecretBase password = default(SecretBase), object authHeaders = default(object), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object aadResourceId = default(object), object encryptedCredential = default(object), CredentialReference credential = default(CredentialReference)) + /// The client ID associated with your + /// application. Type: string (or Expression with resultType + /// string). + /// The client secret associated with your + /// application. + /// The token endpoint of the authorization + /// server to acquire access token. Type: string (or Expression with + /// resultType string). + /// The target service or resource to which the + /// access will be requested. Type: string (or Expression with + /// resultType string). + /// The scope of the access required. It describes + /// what kind of access will be requested. Type: string (or Expression + /// with resultType string). + public RestServiceLinkedService(object url, string authenticationType, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object enableServerCertificateValidation = default(object), object userName = default(object), SecretBase password = default(SecretBase), object authHeaders = default(object), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object aadResourceId = default(object), object encryptedCredential = default(object), CredentialReference credential = default(CredentialReference), object clientId = default(object), SecretBase clientSecret = default(SecretBase), object tokenEndpoint = default(object), object resource = default(object), object scope = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { Url = url; @@ -93,6 +108,11 @@ public RestServiceLinkedService() AadResourceId = aadResourceId; EncryptedCredential = encryptedCredential; Credential = credential; + ClientId = clientId; + ClientSecret = clientSecret; + TokenEndpoint = tokenEndpoint; + Resource = resource; + Scope = scope; CustomInit(); } @@ -118,7 +138,8 @@ public RestServiceLinkedService() /// /// Gets or sets type of authentication used to connect to the REST /// service. Possible values include: 'Anonymous', 'Basic', - /// 'AadServicePrincipal', 'ManagedServiceIdentity' + /// 'AadServicePrincipal', 'ManagedServiceIdentity', + /// 'OAuth2ClientCredential' /// [JsonProperty(PropertyName = "typeProperties.authenticationType")] public string AuthenticationType { get; set; } @@ -196,6 +217,43 @@ public RestServiceLinkedService() [JsonProperty(PropertyName = "typeProperties.credential")] public CredentialReference Credential { get; set; } + /// + /// Gets or sets the client ID associated with your application. Type: + /// string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.clientId")] + public object ClientId { get; set; } + + /// + /// Gets or sets the client secret associated with your application. + /// + [JsonProperty(PropertyName = "typeProperties.clientSecret")] + public SecretBase ClientSecret { get; set; } + + /// + /// Gets or sets the token endpoint of the authorization server to + /// acquire access token. Type: string (or Expression with resultType + /// string). + /// + [JsonProperty(PropertyName = "typeProperties.tokenEndpoint")] + public object TokenEndpoint { get; set; } + + /// + /// Gets or sets the target service or resource to which the access + /// will be requested. Type: string (or Expression with resultType + /// string). + /// + [JsonProperty(PropertyName = "typeProperties.resource")] + public object Resource { get; set; } + + /// + /// Gets or sets the scope of the access required. It describes what + /// kind of access will be requested. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.scope")] + public object Scope { get; set; } + /// /// Validate the object. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapOdpLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapOdpLinkedService.cs new file mode 100644 index 0000000000000..407b4f9aae311 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapOdpLinkedService.cs @@ -0,0 +1,271 @@ +// +// 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; + + /// + /// SAP ODP Linked Service. + /// + [Newtonsoft.Json.JsonObject("SapOdp")] + [Rest.Serialization.JsonTransformation] + public partial class SapOdpLinkedService : LinkedService + { + /// + /// Initializes a new instance of the SapOdpLinkedService class. + /// + public SapOdpLinkedService() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the SapOdpLinkedService 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. + /// Host name of the SAP instance where the table + /// is located. Type: string (or Expression with resultType + /// string). + /// System number of the SAP system where + /// the table is located. (Usually a two-digit decimal number + /// represented as a string.) Type: string (or Expression with + /// resultType string). + /// Client ID of the client on the SAP system + /// where the table is located. (Usually a three-digit decimal number + /// represented as a string) Type: string (or Expression with + /// resultType string). + /// Language of the SAP system where the table + /// is located. The default value is EN. Type: string (or Expression + /// with resultType string). + /// SystemID of the SAP system where the table + /// is located. Type: string (or Expression with resultType + /// string). + /// Username to access the SAP server where the + /// table is located. Type: string (or Expression with resultType + /// string). + /// Password to access the SAP server where the + /// table is located. + /// The hostname of the SAP Message Server. + /// Type: string (or Expression with resultType string). + /// The service name or port number + /// of the Message Server. Type: string (or Expression with resultType + /// string). + /// SNC activation indicator to access the SAP + /// server where the table is located. Must be either 0 (off) or 1 + /// (on). Type: string (or Expression with resultType string). + /// Initiator's SNC name to access the SAP + /// server where the table is located. Type: string (or Expression with + /// resultType string). + /// Communication partner's SNC name to + /// access the SAP server where the table is located. Type: string (or + /// Expression with resultType string). + /// External security product's library to + /// access the SAP server where the table is located. Type: string (or + /// Expression with resultType string). + /// SNC Quality of Protection. Allowed value + /// include: 1, 2, 3, 8, 9. Type: string (or Expression with resultType + /// string). + /// SNC X509 certificate file path. + /// Type: string (or Expression with resultType string). + /// The Logon Group for the SAP System. Type: + /// string (or Expression with resultType string). + /// The subscriber name. Type: string (or + /// Expression with resultType string). + /// The encrypted credential used for + /// authentication. Credentials are encrypted using the integration + /// runtime credential manager. Type: string (or Expression with + /// resultType string). + public SapOdpLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object server = default(object), object systemNumber = default(object), object clientId = default(object), object language = default(object), object systemId = default(object), object userName = default(object), SecretBase password = default(SecretBase), object messageServer = default(object), object messageServerService = default(object), object sncMode = default(object), object sncMyName = default(object), object sncPartnerName = default(object), object sncLibraryPath = default(object), object sncQop = default(object), object x509CertificatePath = default(object), object logonGroup = default(object), object subscriberName = default(object), object encryptedCredential = default(object)) + : base(additionalProperties, connectVia, description, parameters, annotations) + { + Server = server; + SystemNumber = systemNumber; + ClientId = clientId; + Language = language; + SystemId = systemId; + UserName = userName; + Password = password; + MessageServer = messageServer; + MessageServerService = messageServerService; + SncMode = sncMode; + SncMyName = sncMyName; + SncPartnerName = sncPartnerName; + SncLibraryPath = sncLibraryPath; + SncQop = sncQop; + X509CertificatePath = x509CertificatePath; + LogonGroup = logonGroup; + SubscriberName = subscriberName; + EncryptedCredential = encryptedCredential; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets host name of the SAP instance where the table is + /// located. Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.server")] + public object Server { get; set; } + + /// + /// Gets or sets system number of the SAP system where the table is + /// located. (Usually a two-digit decimal number represented as a + /// string.) Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.systemNumber")] + public object SystemNumber { get; set; } + + /// + /// Gets or sets client ID of the client on the SAP system where the + /// table is located. (Usually a three-digit decimal number represented + /// as a string) Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.clientId")] + public object ClientId { get; set; } + + /// + /// Gets or sets language of the SAP system where the table is located. + /// The default value is EN. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.language")] + public object Language { get; set; } + + /// + /// Gets or sets systemID of the SAP system where the table is located. + /// Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.systemId")] + public object SystemId { get; set; } + + /// + /// Gets or sets username to access the SAP server where the table is + /// located. Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.userName")] + public object UserName { get; set; } + + /// + /// Gets or sets password to access the SAP server where the table is + /// located. + /// + [JsonProperty(PropertyName = "typeProperties.password")] + public SecretBase Password { get; set; } + + /// + /// Gets or sets the hostname of the SAP Message Server. Type: string + /// (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.messageServer")] + public object MessageServer { get; set; } + + /// + /// Gets or sets the service name or port number of the Message Server. + /// Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.messageServerService")] + public object MessageServerService { get; set; } + + /// + /// Gets or sets SNC activation indicator to access the SAP server + /// where the table is located. Must be either 0 (off) or 1 (on). Type: + /// string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.sncMode")] + public object SncMode { get; set; } + + /// + /// Gets or sets initiator's SNC name to access the SAP server where + /// the table is located. Type: string (or Expression with resultType + /// string). + /// + [JsonProperty(PropertyName = "typeProperties.sncMyName")] + public object SncMyName { get; set; } + + /// + /// Gets or sets communication partner's SNC name to access the SAP + /// server where the table is located. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.sncPartnerName")] + public object SncPartnerName { get; set; } + + /// + /// Gets or sets external security product's library to access the SAP + /// server where the table is located. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.sncLibraryPath")] + public object SncLibraryPath { get; set; } + + /// + /// Gets or sets SNC Quality of Protection. Allowed value include: 1, + /// 2, 3, 8, 9. Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.sncQop")] + public object SncQop { get; set; } + + /// + /// Gets or sets SNC X509 certificate file path. Type: string (or + /// Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.x509CertificatePath")] + public object X509CertificatePath { get; set; } + + /// + /// Gets or sets the Logon Group for the SAP System. Type: string (or + /// Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.logonGroup")] + public object LogonGroup { get; set; } + + /// + /// Gets or sets the subscriber name. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.subscriberName")] + public object SubscriberName { 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(); + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapOdpResourceDataset.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapOdpResourceDataset.cs new file mode 100644 index 0000000000000..2859c0ac03725 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapOdpResourceDataset.cs @@ -0,0 +1,104 @@ +// +// 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; + + /// + /// SAP ODP Resource properties. + /// + [Newtonsoft.Json.JsonObject("SapOdpResource")] + [Rest.Serialization.JsonTransformation] + public partial class SapOdpResourceDataset : Dataset + { + /// + /// Initializes a new instance of the SapOdpResourceDataset class. + /// + public SapOdpResourceDataset() + { + LinkedServiceName = new LinkedServiceReference(); + CustomInit(); + } + + /// + /// Initializes a new instance of the SapOdpResourceDataset class. + /// + /// Linked service reference. + /// The context of the SAP ODP Object. Type: + /// string (or Expression with resultType string). + /// The name of the SAP ODP Object. Type: + /// string (or Expression with resultType string). + /// Unmatched properties from the + /// message are deserialized this collection + /// Dataset description. + /// Columns that define the structure of the + /// dataset. Type: array (or Expression with resultType array), + /// itemType: DatasetDataElement. + /// Columns that define the physical type schema + /// of the dataset. Type: array (or Expression with resultType array), + /// itemType: DatasetSchemaDataElement. + /// Parameters for dataset. + /// List of tags that can be used for + /// describing the Dataset. + /// The folder that this Dataset is in. If not + /// specified, Dataset will appear at the root level. + public SapOdpResourceDataset(LinkedServiceReference linkedServiceName, object context, object objectName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), object schema = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) + { + Context = context; + ObjectName = objectName; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the context of the SAP ODP Object. Type: string (or + /// Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.context")] + public object Context { get; set; } + + /// + /// Gets or sets the name of the SAP ODP Object. Type: string (or + /// Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.objectName")] + public object ObjectName { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public override void Validate() + { + base.Validate(); + if (Context == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "Context"); + } + if (ObjectName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "ObjectName"); + } + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapOdpSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapOdpSource.cs new file mode 100644 index 0000000000000..3cc7e910832fa --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapOdpSource.cs @@ -0,0 +1,112 @@ +// +// 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; + + /// + /// A copy activity source for SAP ODP source. + /// + public partial class SapOdpSource : TabularSource + { + /// + /// Initializes a new instance of the SapOdpSource class. + /// + public SapOdpSource() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the SapOdpSource class. + /// + /// Unmatched properties from the + /// message are deserialized this collection + /// Source retry count. Type: integer + /// (or Expression with resultType integer). + /// Source retry wait. Type: string (or + /// Expression with resultType string), pattern: + /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// The maximum concurrent + /// connection count for the source data store. Type: integer (or + /// Expression with resultType integer). + /// If true, disable data store + /// metrics collection. Default is false. Type: boolean (or Expression + /// with resultType boolean). + /// Query timeout. Type: string (or + /// Expression with resultType string), pattern: + /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Specifies the additional columns to + /// be added to source data. Type: array of objects(AdditionalColumns) + /// (or Expression with resultType array of objects). + /// The extraction mode. Allowed value + /// include: Full, Delta and Recovery. The default value is Full. Type: + /// string (or Expression with resultType string). + /// The subscriber process to manage + /// the delta process. Type: string (or Expression with resultType + /// string). + /// Specifies the selection conditions from + /// source data. Type: array of objects(selection) (or Expression with + /// resultType array of objects). + /// Specifies the columns to be selected from + /// source data. Type: array of objects(projection) (or Expression with + /// resultType array of objects). + public SapOdpSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object disableMetricsCollection = default(object), object queryTimeout = default(object), object additionalColumns = default(object), object extractionMode = default(object), object subscriberProcess = default(object), object selection = default(object), object projection = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) + { + ExtractionMode = extractionMode; + SubscriberProcess = subscriberProcess; + Selection = selection; + Projection = projection; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the extraction mode. Allowed value include: Full, + /// Delta and Recovery. The default value is Full. Type: string (or + /// Expression with resultType string). + /// + [JsonProperty(PropertyName = "extractionMode")] + public object ExtractionMode { get; set; } + + /// + /// Gets or sets the subscriber process to manage the delta process. + /// Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "subscriberProcess")] + public object SubscriberProcess { get; set; } + + /// + /// Gets or sets specifies the selection conditions from source data. + /// Type: array of objects(selection) (or Expression with resultType + /// array of objects). + /// + [JsonProperty(PropertyName = "selection")] + public object Selection { get; set; } + + /// + /// Gets or sets specifies the columns to be selected from source data. + /// Type: array of objects(projection) (or Expression with resultType + /// array of objects). + /// + [JsonProperty(PropertyName = "projection")] + public object Projection { get; set; } + + } +} 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 717affd1dab8a..7953b080cd973 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,14 @@ 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.2.0 + 6.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 b5d3283f55326..6c219afa4ac90 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs @@ -7,7 +7,7 @@ [assembly: AssemblyTitle("Microsoft Azure Data Factory Management Library")] [assembly: AssemblyDescription("Provides management functionality for Microsoft Azure Data Factory Resources.")] [assembly: AssemblyVersion("6.0.0.0")] -[assembly: AssemblyFileVersion("6.2.0.0")] +[assembly: AssemblyFileVersion("6.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 90bf33d2fe852..bc66d2cf449bb 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs @@ -3385,6 +3385,28 @@ public class LinkedServiceJsonSamples : JsonSampleCollection