From a907aa9be22b59535d42bcff9ee8803267f475dc Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Tue, 4 Jan 2022 11:04:53 +0800 Subject: [PATCH 1/4] [DataFactory]Added new features into 5.1.0 --- .../datafactory_resource-manager.txt | 5 +- .../src/CHANGELOG.md | 5 ++ .../GoogleAdWordsLinkedService.cs | 72 +++++++++++++++++++ .../AzureDatabricksDeltaLakeLinkedService.cs | 27 ++++++- .../Generated/Models/CosmosDbLinkedService.cs | 16 ++++- .../Generated/Models/DynamicsLinkedService.cs | 16 ++++- .../Models/GoogleAdWordsLinkedService.cs | 40 +++++------ ...nkedIntegrationRuntimeRbacAuthorization.cs | 16 ++++- ...rosoft.Azure.Management.DataFactory.csproj | 8 +-- .../src/Properties/AssemblyInfo.cs | 4 +- .../JsonSamples/LinkedServiceJsonSamples.cs | 19 +++++ 11 files changed, 194 insertions(+), 34 deletions(-) create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/GoogleAdWordsLinkedService.cs diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt index 620a19559122..3d701fa75c92 100644 --- a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt +++ b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt @@ -4,12 +4,11 @@ Commencing code generation Generating CSharp code Executing AutoRest command cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/main/specification/datafactory/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\Projects\azure-sdk-for-net\sdk -Autorest CSharp Version: 2.3.82 -2021-12-09 02:19:59 UTC +2022-01-04 02:45:58 UTC Azure-rest-api-specs repository information GitHub fork: Azure Branch: main -Commit: 40cb73ed0c84fa515b911af5fdf77f68b764ea74 +Commit: 2b083f0d1b7ecb0717741551fa543a73e86d672c AutoRest information Requested version: v2 Bootstrapper version: autorest@2.0.4413 diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md index d3b5d422ee80..7e5e4c8f290b 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog for the Azure Data Factory V2 .NET SDK +## Version 5.1.0 +### Feature Additions +- Support UAMI M2 +- Add connectionProperties in GoogleAdWordsLinkedService + ## Version 5.0.0 ### Feature Additions ### Breaking Changes diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/GoogleAdWordsLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/GoogleAdWordsLinkedService.cs new file mode 100644 index 000000000000..bcaae254ee68 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Customizations/GoogleAdWordsLinkedService.cs @@ -0,0 +1,72 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + public partial class GoogleAdWordsLinkedService : LinkedService + { + /// + /// Initializes a new instance of the GoogleAdWordsLinkedService class. + /// + /// The Client customer ID of the + /// AdWords account that you want to fetch report data for. + /// The developer token associated with + /// the manager account that you use to grant access to the AdWords + /// API. + /// The OAuth 2.0 authentication + /// mechanism used for authentication. ServiceAuthentication can only + /// be used on self-hosted IR. Possible values include: + /// 'ServiceAuthentication', 'UserAuthentication' + /// Unmatched properties from the + /// message are deserialized this collection + /// The integration runtime reference. + /// Linked service description. + /// Parameters for linked service. + /// List of tags that can be used for + /// describing the linked service. + /// The refresh token obtained from Google + /// for authorizing access to AdWords for UserAuthentication. + /// The client id of the google application used + /// to acquire the refresh token. Type: string (or Expression with + /// resultType string). + /// The client secret of the google + /// application used to acquire the refresh token. + /// The service account email ID that is used for + /// ServiceAuthentication and can only be used on self-hosted + /// IR. + /// The full path to the .p12 key file that + /// is used to authenticate the service account email address and can + /// only be used on self-hosted IR. + /// The full path of the .pem file + /// containing trusted CA certificates for verifying the server when + /// connecting over SSL. This property can only be set when using SSL + /// on self-hosted IR. The default value is the cacerts.pem file + /// installed with the IR. + /// Specifies whether to use a CA + /// certificate from the system trust store or from a specified PEM + /// file. The default value is false. + /// The encrypted credential used for + /// authentication. Credentials are encrypted using the integration + /// runtime credential manager. Type: string (or Expression with + /// resultType string). + public GoogleAdWordsLinkedService(object clientCustomerID, SecretBase developerToken, string authenticationType, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), SecretBase refreshToken = default(SecretBase), object clientId = default(object), SecretBase clientSecret = default(SecretBase), object email = default(object), object keyFilePath = default(object), object trustedCertPath = default(object), object useSystemTrustStore = default(object), object encryptedCredential = default(object)) + : base(additionalProperties, connectVia, description, parameters, annotations) + { + ClientCustomerID = clientCustomerID; + DeveloperToken = developerToken; + AuthenticationType = authenticationType; + RefreshToken = refreshToken; + ClientId = clientId; + ClientSecret = clientSecret; + Email = email; + KeyFilePath = keyFilePath; + TrustedCertPath = trustedCertPath; + UseSystemTrustStore = useSystemTrustStore; + EncryptedCredential = encryptedCredential; + CustomInit(); + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDatabricksDeltaLakeLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDatabricksDeltaLakeLinkedService.cs index ec88ac66a5ac..a88260a18eb3 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDatabricksDeltaLakeLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDatabricksDeltaLakeLinkedService.cs @@ -58,13 +58,20 @@ public AzureDatabricksDeltaLakeLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public AzureDatabricksDeltaLakeLinkedService(object domain, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), SecretBase accessToken = default(SecretBase), object clusterId = default(object), object encryptedCredential = default(object)) + /// The credential reference containing + /// authentication information. + /// Workspace resource id for + /// databricks REST API. Type: string (or Expression with resultType + /// string). + public AzureDatabricksDeltaLakeLinkedService(object domain, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), SecretBase accessToken = default(SecretBase), object clusterId = default(object), object encryptedCredential = default(object), CredentialReference credential = default(CredentialReference), object workspaceResourceId = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { Domain = domain; AccessToken = accessToken; ClusterId = clusterId; EncryptedCredential = encryptedCredential; + Credential = credential; + WorkspaceResourceId = workspaceResourceId; CustomInit(); } @@ -105,6 +112,20 @@ public AzureDatabricksDeltaLakeLinkedService() [JsonProperty(PropertyName = "typeProperties.encryptedCredential")] public object EncryptedCredential { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "typeProperties.credential")] + public CredentialReference Credential { get; set; } + + /// + /// Gets or sets workspace resource id for databricks REST API. Type: + /// string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.workspaceResourceId")] + public object WorkspaceResourceId { get; set; } + /// /// Validate the object. /// @@ -118,6 +139,10 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "Domain"); } + if (Credential != null) + { + Credential.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CosmosDbLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CosmosDbLinkedService.cs index 0ae5ab29f54c..8536e1707798 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CosmosDbLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CosmosDbLinkedService.cs @@ -83,7 +83,9 @@ public CosmosDbLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public CosmosDbLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), object accountEndpoint = default(object), object database = default(object), SecretBase accountKey = default(SecretBase), object servicePrincipalId = default(object), string servicePrincipalCredentialType = default(string), SecretBase servicePrincipalCredential = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), string connectionMode = default(string), object encryptedCredential = default(object)) + /// The credential reference containing + /// authentication information. + public CosmosDbLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), object accountEndpoint = default(object), object database = default(object), SecretBase accountKey = default(SecretBase), object servicePrincipalId = default(object), string servicePrincipalCredentialType = default(string), SecretBase servicePrincipalCredential = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), string connectionMode = default(string), object encryptedCredential = default(object), CredentialReference credential = default(CredentialReference)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; @@ -97,6 +99,7 @@ public CosmosDbLinkedService() AzureCloudType = azureCloudType; ConnectionMode = connectionMode; EncryptedCredential = encryptedCredential; + Credential = credential; CustomInit(); } @@ -197,6 +200,13 @@ public CosmosDbLinkedService() [JsonProperty(PropertyName = "typeProperties.encryptedCredential")] public object EncryptedCredential { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "typeProperties.credential")] + public CredentialReference Credential { get; set; } + /// /// Validate the object. /// @@ -206,6 +216,10 @@ public CosmosDbLinkedService() public override void Validate() { base.Validate(); + if (Credential != null) + { + Credential.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DynamicsLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DynamicsLinkedService.cs index 8bc7dbd7d0eb..d2db924bf121 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DynamicsLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/DynamicsLinkedService.cs @@ -90,7 +90,9 @@ public DynamicsLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public DynamicsLinkedService(object deploymentType, object authenticationType, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object hostName = default(object), object port = default(object), object serviceUri = default(object), object organizationName = default(object), object username = default(object), SecretBase password = default(SecretBase), object servicePrincipalId = default(object), object servicePrincipalCredentialType = default(object), SecretBase servicePrincipalCredential = default(SecretBase), object encryptedCredential = default(object)) + /// The credential reference containing + /// authentication information. + public DynamicsLinkedService(object deploymentType, object authenticationType, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object hostName = default(object), object port = default(object), object serviceUri = default(object), object organizationName = default(object), object username = default(object), SecretBase password = default(SecretBase), object servicePrincipalId = default(object), object servicePrincipalCredentialType = default(object), SecretBase servicePrincipalCredential = default(SecretBase), object encryptedCredential = default(object), CredentialReference credential = default(CredentialReference)) : base(additionalProperties, connectVia, description, parameters, annotations) { DeploymentType = deploymentType; @@ -105,6 +107,7 @@ public DynamicsLinkedService() ServicePrincipalCredentialType = servicePrincipalCredentialType; ServicePrincipalCredential = servicePrincipalCredential; EncryptedCredential = encryptedCredential; + Credential = credential; CustomInit(); } @@ -215,6 +218,13 @@ public DynamicsLinkedService() [JsonProperty(PropertyName = "typeProperties.encryptedCredential")] public object EncryptedCredential { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "typeProperties.credential")] + public CredentialReference Credential { get; set; } + /// /// Validate the object. /// @@ -232,6 +242,10 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "AuthenticationType"); } + if (Credential != null) + { + Credential.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GoogleAdWordsLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GoogleAdWordsLinkedService.cs index 05eb27a16103..2a3bdf659ae7 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GoogleAdWordsLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GoogleAdWordsLinkedService.cs @@ -35,6 +35,16 @@ public GoogleAdWordsLinkedService() /// /// Initializes a new instance of the GoogleAdWordsLinkedService class. /// + /// Unmatched properties from the + /// message are deserialized this collection + /// The integration runtime reference. + /// Linked service description. + /// Parameters for linked service. + /// List of tags that can be used for + /// describing the linked service. + /// Properties used to connect to + /// GoogleAds. It is mutually exclusive with any other properties in + /// the linked service. Type: object. /// The Client customer ID of the /// AdWords account that you want to fetch report data for. /// The developer token associated with @@ -44,13 +54,6 @@ public GoogleAdWordsLinkedService() /// mechanism used for authentication. ServiceAuthentication can only /// be used on self-hosted IR. Possible values include: /// 'ServiceAuthentication', 'UserAuthentication' - /// Unmatched properties from the - /// message are deserialized this collection - /// The integration runtime reference. - /// Linked service description. - /// Parameters for linked service. - /// List of tags that can be used for - /// describing the linked service. /// The refresh token obtained from Google /// for authorizing access to AdWords for UserAuthentication. /// The client id of the google application used @@ -76,9 +79,10 @@ public GoogleAdWordsLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public GoogleAdWordsLinkedService(object clientCustomerID, SecretBase developerToken, string authenticationType, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), SecretBase refreshToken = default(SecretBase), object clientId = default(object), SecretBase clientSecret = default(SecretBase), object email = default(object), object keyFilePath = default(object), object trustedCertPath = default(object), object useSystemTrustStore = default(object), object encryptedCredential = default(object)) + public GoogleAdWordsLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionProperties = default(object), object clientCustomerID = default(object), SecretBase developerToken = default(SecretBase), string authenticationType = default(string), SecretBase refreshToken = default(SecretBase), object clientId = default(object), SecretBase clientSecret = default(SecretBase), object email = default(object), object keyFilePath = default(object), object trustedCertPath = default(object), object useSystemTrustStore = default(object), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { + ConnectionProperties = connectionProperties; ClientCustomerID = clientCustomerID; DeveloperToken = developerToken; AuthenticationType = authenticationType; @@ -98,6 +102,14 @@ public GoogleAdWordsLinkedService() /// partial void CustomInit(); + /// + /// Gets or sets properties used to connect to GoogleAds. It is + /// mutually exclusive with any other properties in the linked service. + /// Type: object. + /// + [JsonProperty(PropertyName = "typeProperties.connectionProperties")] + public object ConnectionProperties { get; set; } + /// /// Gets or sets the Client customer ID of the AdWords account that you /// want to fetch report data for. @@ -192,18 +204,6 @@ public GoogleAdWordsLinkedService() public override void Validate() { base.Validate(); - if (ClientCustomerID == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "ClientCustomerID"); - } - if (DeveloperToken == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "DeveloperToken"); - } - if (AuthenticationType == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "AuthenticationType"); - } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/LinkedIntegrationRuntimeRbacAuthorization.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/LinkedIntegrationRuntimeRbacAuthorization.cs index 6dc560c8f96f..2296f23be6dc 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/LinkedIntegrationRuntimeRbacAuthorization.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/LinkedIntegrationRuntimeRbacAuthorization.cs @@ -36,9 +36,12 @@ public LinkedIntegrationRuntimeRbacAuthorization() /// /// The resource identifier of the integration /// runtime to be shared. - public LinkedIntegrationRuntimeRbacAuthorization(string resourceId) + /// The credential reference containing + /// authentication information. + public LinkedIntegrationRuntimeRbacAuthorization(string resourceId, CredentialReference credential = default(CredentialReference)) { ResourceId = resourceId; + Credential = credential; CustomInit(); } @@ -54,6 +57,13 @@ public LinkedIntegrationRuntimeRbacAuthorization(string resourceId) [JsonProperty(PropertyName = "resourceId")] public string ResourceId { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "credential")] + public CredentialReference Credential { get; set; } + /// /// Validate the object. /// @@ -66,6 +76,10 @@ public virtual void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "ResourceId"); } + if (Credential != null) + { + Credential.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj index f0dc89dee1a6..830d39edfbbc 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj @@ -5,15 +5,13 @@ Microsoft.Azure.Management.DataFactory Azure Data Factory V2 is the data integration platform that goes beyond Azure Data Factory V1's orchestration and batch-processing of time-series data, with a general purpose app model supporting modern data warehousing patterns and scenarios, lift-and-shift SSIS, and data-driven SaaS applications. Compose and manage reliable and secure data integration workflows at scale. Use native ADF data connectors and Integration Runtimes to move and transform cloud and on-premises data that can be unstructured, semi-structured, and structured with Hadoop, Azure Data Lake, Spark, SQL Server, Cosmos DB and many other data platforms. - 5.0.0 + 5.1.0 Microsoft.Azure.Management.DataFactory Microsoft Azure resource management;Data Factory;ADF; diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs index a61b4f110ab7..6ede3735f133 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs @@ -6,8 +6,8 @@ [assembly: AssemblyTitle("Microsoft Azure Data Factory Management Library")] [assembly: AssemblyDescription("Provides management functionality for Microsoft Azure Data Factory Resources.")] -[assembly: AssemblyVersion("5.0.0.0")] -[assembly: AssemblyFileVersion("5.0.0.0")] +[assembly: AssemblyVersion("5.1.0.0")] +[assembly: AssemblyFileVersion("5.1.0.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] [assembly: AssemblyProduct("Microsoft Azure .NET SDK")] diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs index 783bdd2978ed..e2c7dabdf8a4 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs @@ -2677,6 +2677,25 @@ public class LinkedServiceJsonSamples : JsonSampleCollection Date: Tue, 4 Jan 2022 11:06:26 +0800 Subject: [PATCH 2/4] update --- .../Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md index 7e5e4c8f290b..990e4e3bf0c4 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md @@ -2,8 +2,8 @@ ## Version 5.1.0 ### Feature Additions -- Support UAMI M2 -- Add connectionProperties in GoogleAdWordsLinkedService +- Added support UAMI M2 +- Added connectionProperties in GoogleAdWordsLinkedService ## Version 5.0.0 ### Feature Additions From 4967c05cc6031e0f851321ba3b07fd60ccd90c03 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Wed, 5 Jan 2022 12:30:43 +0800 Subject: [PATCH 3/4] add one change --- .../datafactory_resource-manager.txt | 5 ++- .../src/CHANGELOG.md | 1 + .../Models/AzureBlobFSLinkedService.cs | 37 ++++++++++++++++++- ...rosoft.Azure.Management.DataFactory.csproj | 5 ++- .../JsonSamples/LinkedServiceJsonSamples.cs | 7 +++- 5 files changed, 49 insertions(+), 6 deletions(-) diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt index 3d701fa75c92..28443ac9b1f2 100644 --- a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt +++ b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt @@ -4,11 +4,12 @@ Commencing code generation Generating CSharp code Executing AutoRest command cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/main/specification/datafactory/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\Projects\azure-sdk-for-net\sdk -2022-01-04 02:45:58 UTC +Autorest CSharp Version: 2.3.82 +2022-01-05 04:17:30 UTC Azure-rest-api-specs repository information GitHub fork: Azure Branch: main -Commit: 2b083f0d1b7ecb0717741551fa543a73e86d672c +Commit: 7b89a1a3fcb08b6f9f12ee67049b6b8d561ad684 AutoRest information Requested version: v2 Bootstrapper version: autorest@2.0.4413 diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md index 990e4e3bf0c4..dcabea5b249c 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md @@ -4,6 +4,7 @@ ### Feature Additions - Added support UAMI M2 - Added connectionProperties in GoogleAdWordsLinkedService +- Added servicePrincipalCredentialType and servicePrincipalCredential into AzureBlobFSLinkedService ## Version 5.0.0 ### Feature Additions diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSLinkedService.cs index ec81f0322ca5..ef79d222a831 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSLinkedService.cs @@ -68,7 +68,19 @@ public AzureBlobFSLinkedService() /// resultType string). /// The credential reference containing /// authentication information. - public AzureBlobFSLinkedService(object url, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object accountKey = default(object), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object encryptedCredential = default(object), CredentialReference credential = default(CredentialReference)) + /// The service principal + /// credential type to use in Server-To-Server authentication. + /// 'ServicePrincipalKey' for key/secret, 'ServicePrincipalCert' for + /// certificate. Type: string (or Expression with resultType + /// string). + /// The credential of the + /// service principal object in Azure Active Directory. If + /// servicePrincipalCredentialType is 'ServicePrincipalKey', + /// servicePrincipalCredential can be SecureString or + /// AzureKeyVaultSecretReference. If servicePrincipalCredentialType is + /// 'ServicePrincipalCert', servicePrincipalCredential can only be + /// AzureKeyVaultSecretReference. + public AzureBlobFSLinkedService(object url, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object accountKey = default(object), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object encryptedCredential = default(object), CredentialReference credential = default(CredentialReference), object servicePrincipalCredentialType = default(object), SecretBase servicePrincipalCredential = default(SecretBase)) : base(additionalProperties, connectVia, description, parameters, annotations) { Url = url; @@ -79,6 +91,8 @@ public AzureBlobFSLinkedService() AzureCloudType = azureCloudType; EncryptedCredential = encryptedCredential; Credential = credential; + ServicePrincipalCredentialType = servicePrincipalCredentialType; + ServicePrincipalCredential = servicePrincipalCredential; CustomInit(); } @@ -149,6 +163,27 @@ public AzureBlobFSLinkedService() [JsonProperty(PropertyName = "typeProperties.credential")] public CredentialReference Credential { get; set; } + /// + /// Gets or sets the service principal credential type to use in + /// Server-To-Server authentication. 'ServicePrincipalKey' for + /// key/secret, 'ServicePrincipalCert' for certificate. Type: string + /// (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.servicePrincipalCredentialType")] + public object ServicePrincipalCredentialType { get; set; } + + /// + /// Gets or sets the credential of the service principal object in + /// Azure Active Directory. If servicePrincipalCredentialType is + /// 'ServicePrincipalKey', servicePrincipalCredential can be + /// SecureString or AzureKeyVaultSecretReference. If + /// servicePrincipalCredentialType is 'ServicePrincipalCert', + /// servicePrincipalCredential can only be + /// AzureKeyVaultSecretReference. + /// + [JsonProperty(PropertyName = "typeProperties.servicePrincipalCredential")] + public SecretBase ServicePrincipalCredential { get; set; } + /// /// Validate the object. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj index 830d39edfbbc..09a2fb1ae1bd 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj @@ -10,8 +10,9 @@ Microsoft Azure resource management;Data Factory;ADF; diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs index e2c7dabdf8a4..cdb07ff29899 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs @@ -27,7 +27,12 @@ public class LinkedServiceJsonSamples : JsonSampleCollection Date: Mon, 7 Feb 2022 10:15:32 +0800 Subject: [PATCH 4/4] [DataFactory]Added new features into 5.2.0 --- .../datafactory_resource-manager.txt | 4 +- .../src/CHANGELOG.md | 5 + .../Models/FactoryUpdateParameters.cs | 7 +- .../src/Generated/Models/FailActivity.cs | 107 ++++++++++++++++++ ...rosoft.Azure.Management.DataFactory.csproj | 7 +- .../src/Properties/AssemblyInfo.cs | 4 +- 6 files changed, 124 insertions(+), 10 deletions(-) create mode 100644 sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FailActivity.cs diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt index 28443ac9b1f2..1fb700cf39cb 100644 --- a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt +++ b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt @@ -5,11 +5,11 @@ Generating CSharp code Executing AutoRest command cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/main/specification/datafactory/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\Projects\azure-sdk-for-net\sdk Autorest CSharp Version: 2.3.82 -2022-01-05 04:17:30 UTC +2022-02-07 01:57:04 UTC Azure-rest-api-specs repository information GitHub fork: Azure Branch: main -Commit: 7b89a1a3fcb08b6f9f12ee67049b6b8d561ad684 +Commit: 6af1afc7c3fbdea232a80f1334894d459e1dc922 AutoRest information Requested version: v2 Bootstrapper version: autorest@2.0.4413 diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md index dcabea5b249c..63a56d4df4d7 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog for the Azure Data Factory V2 .NET SDK +## Version 5.2.0 +### Feature Additions +- Added FailActivity in ADF +- Fixed update PublicNetworkAccess not work in Factory Update API + ## Version 5.1.0 ### Feature Additions - Added support UAMI M2 diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryUpdateParameters.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryUpdateParameters.cs index fc5f63bde9ce..6cd911726e6c 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryUpdateParameters.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FactoryUpdateParameters.cs @@ -10,6 +10,8 @@ namespace Microsoft.Azure.Management.DataFactory.Models { + using Microsoft.Rest; + using Microsoft.Rest.Serialization; using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; @@ -18,6 +20,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models /// /// Parameters for updating a factory resource. /// + [Rest.Serialization.JsonTransformation] public partial class FactoryUpdateParameters { /// @@ -66,13 +69,13 @@ public FactoryUpdateParameters() /// Gets or sets whether or not public network access is allowed for /// the data factory. Possible values include: 'Enabled', 'Disabled' /// - [JsonProperty(PropertyName = "publicNetworkAccess")] + [JsonProperty(PropertyName = "properties.publicNetworkAccess")] public string PublicNetworkAccess { get; set; } /// /// Validate the object. /// - /// + /// /// Thrown if validation fails /// public virtual void Validate() diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FailActivity.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FailActivity.cs new file mode 100644 index 000000000000..8f4c66ca5d0d --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/FailActivity.cs @@ -0,0 +1,107 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + using Microsoft.Rest; + using Microsoft.Rest.Serialization; + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// This activity will fail within its own scope and output a custom error + /// message and error code. The error message and code can provided either + /// as a string literal or as an expression that can be evaluated to a + /// string at runtime. The activity scope can be the whole pipeline or a + /// control activity (e.g. foreach, switch, until), if the fail activity is + /// contained in it. + /// + [Newtonsoft.Json.JsonObject("Fail")] + [Rest.Serialization.JsonTransformation] + public partial class FailActivity : ControlActivity + { + /// + /// Initializes a new instance of the FailActivity class. + /// + public FailActivity() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the FailActivity class. + /// + /// Activity name. + /// The error message that surfaced in the Fail + /// activity. It can be dynamic content that's evaluated to a non + /// empty/blank string at runtime. Type: string (or Expression with + /// resultType string). + /// The error code that categorizes the error + /// type of the Fail activity. It can be dynamic content that's + /// evaluated to a non empty/blank string at runtime. Type: string (or + /// Expression with resultType string). + /// Unmatched properties from the + /// message are deserialized this collection + /// Activity description. + /// Activity depends on condition. + /// Activity user properties. + public FailActivity(string name, object message, object errorCode, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList)) + : base(name, additionalProperties, description, dependsOn, userProperties) + { + Message = message; + ErrorCode = errorCode; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the error message that surfaced in the Fail activity. + /// It can be dynamic content that's evaluated to a non empty/blank + /// string at runtime. Type: string (or Expression with resultType + /// string). + /// + [JsonProperty(PropertyName = "typeProperties.message")] + public object Message { get; set; } + + /// + /// Gets or sets the error code that categorizes the error type of the + /// Fail activity. It can be dynamic content that's evaluated to a non + /// empty/blank string at runtime. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.errorCode")] + public object ErrorCode { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public override void Validate() + { + base.Validate(); + if (Message == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "Message"); + } + if (ErrorCode == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "ErrorCode"); + } + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj index 09a2fb1ae1bd..b295c8ca31aa 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj @@ -5,14 +5,13 @@ Microsoft.Azure.Management.DataFactory Azure Data Factory V2 is the data integration platform that goes beyond Azure Data Factory V1's orchestration and batch-processing of time-series data, with a general purpose app model supporting modern data warehousing patterns and scenarios, lift-and-shift SSIS, and data-driven SaaS applications. Compose and manage reliable and secure data integration workflows at scale. Use native ADF data connectors and Integration Runtimes to move and transform cloud and on-premises data that can be unstructured, semi-structured, and structured with Hadoop, Azure Data Lake, Spark, SQL Server, Cosmos DB and many other data platforms. - 5.1.0 + 5.2.0 Microsoft.Azure.Management.DataFactory Microsoft Azure resource management;Data Factory;ADF; diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs index 6ede3735f133..b8679468bfab 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs @@ -6,8 +6,8 @@ [assembly: AssemblyTitle("Microsoft Azure Data Factory Management Library")] [assembly: AssemblyDescription("Provides management functionality for Microsoft Azure Data Factory Resources.")] -[assembly: AssemblyVersion("5.1.0.0")] -[assembly: AssemblyFileVersion("5.1.0.0")] +[assembly: AssemblyVersion("5.2.0.0")] +[assembly: AssemblyFileVersion("5.2.0.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] [assembly: AssemblyProduct("Microsoft Azure .NET SDK")]