diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt index 33df5469eeb6..7a6a2587c2ed 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/master/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 -2021-08-30 02:31:50 UTC +Autorest CSharp Version: 2.3.82 +2021-09-13 02:13:39 UTC Azure-rest-api-specs repository information GitHub fork: Azure Branch: master -Commit: b020247789ba2ab0065ebbcfa69050ce729493b8 +Commit: 9a19506631005d0ff1e3f394c86a9ce10cf51910 AutoRest information Requested version: v2 Bootstrapper version: autorest@3.3.2 diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md index 1d5102d6a657..e08b5f2b0262 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 4.25.0 +### Feature Additions +- Supported UAMI in sql always +- Supported AmazonRdsForSqlServer Source +- Supported subnet id for swift injection of azure-ssis IR + ## Version 4.24.0 ### Feature Additions - Supported AmazonRdsForOracle Source diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForSqlServerLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForSqlServerLinkedService.cs new file mode 100644 index 000000000000..c1e4ab8a64c5 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForSqlServerLinkedService.cs @@ -0,0 +1,128 @@ +// +// 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; + + /// + /// Amazon RDS for SQL Server linked service. + /// + [Newtonsoft.Json.JsonObject("AmazonRdsForSqlServer")] + [Rest.Serialization.JsonTransformation] + public partial class AmazonRdsForSqlServerLinkedService : LinkedService + { + /// + /// Initializes a new instance of the + /// AmazonRdsForSqlServerLinkedService class. + /// + public AmazonRdsForSqlServerLinkedService() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the + /// AmazonRdsForSqlServerLinkedService class. + /// + /// The connection string. Type: string, + /// SecureString or AzureKeyVaultSecretReference. + /// 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 on-premises Windows authentication user + /// name. Type: string (or Expression with resultType string). + /// The on-premises Windows authentication + /// password. + /// The encrypted credential used for + /// authentication. Credentials are encrypted using the integration + /// runtime credential manager. Type: string (or Expression with + /// resultType string). + /// Sql always encrypted + /// properties. + public AmazonRdsForSqlServerLinkedService(object connectionString, 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), object encryptedCredential = default(object), SqlAlwaysEncryptedProperties alwaysEncryptedSettings = default(SqlAlwaysEncryptedProperties)) + : base(additionalProperties, connectVia, description, parameters, annotations) + { + ConnectionString = connectionString; + UserName = userName; + Password = password; + EncryptedCredential = encryptedCredential; + AlwaysEncryptedSettings = alwaysEncryptedSettings; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the connection string. Type: string, SecureString or + /// AzureKeyVaultSecretReference. + /// + [JsonProperty(PropertyName = "typeProperties.connectionString")] + public object ConnectionString { get; set; } + + /// + /// Gets or sets the on-premises Windows authentication user name. + /// Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.userName")] + public object UserName { get; set; } + + /// + /// Gets or sets the on-premises Windows authentication password. + /// + [JsonProperty(PropertyName = "typeProperties.password")] + public SecretBase Password { 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; } + + /// + /// Gets or sets sql always encrypted properties. + /// + [JsonProperty(PropertyName = "typeProperties.alwaysEncryptedSettings")] + public SqlAlwaysEncryptedProperties AlwaysEncryptedSettings { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public override void Validate() + { + base.Validate(); + if (ConnectionString == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "ConnectionString"); + } + if (AlwaysEncryptedSettings != null) + { + AlwaysEncryptedSettings.Validate(); + } + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForSqlServerSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForSqlServerSource.cs new file mode 100644 index 000000000000..4cd61534b2c8 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForSqlServerSource.cs @@ -0,0 +1,132 @@ +// +// 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 Amazon RDS for SQL Server source. + /// + public partial class AmazonRdsForSqlServerSource : TabularSource + { + /// + /// Initializes a new instance of the AmazonRdsForSqlServerSource + /// class. + /// + public AmazonRdsForSqlServerSource() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the AmazonRdsForSqlServerSource + /// 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). + /// SQL reader query. Type: string (or + /// Expression with resultType string). + /// Name of the stored + /// procedure for a SQL Database source. This cannot be used at the + /// same time as SqlReaderQuery. Type: string (or Expression with + /// resultType string). + /// Value and type setting for + /// stored procedure parameters. Example: "{Parameter1: {value: "1", + /// type: "int"}}". + /// Which additional types to + /// produce. + /// The partition mechanism that will be + /// used for Sql read in parallel. Possible values include: "None", + /// "PhysicalPartitionsOfTable", "DynamicRange". + /// The settings that will be leveraged + /// for Sql source partitioning. + public AmazonRdsForSqlServerSource(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 sqlReaderQuery = default(object), object sqlReaderStoredProcedureName = default(object), IDictionary storedProcedureParameters = default(IDictionary), object produceAdditionalTypes = default(object), object partitionOption = default(object), SqlPartitionSettings partitionSettings = default(SqlPartitionSettings)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, disableMetricsCollection, queryTimeout, additionalColumns) + { + SqlReaderQuery = sqlReaderQuery; + SqlReaderStoredProcedureName = sqlReaderStoredProcedureName; + StoredProcedureParameters = storedProcedureParameters; + ProduceAdditionalTypes = produceAdditionalTypes; + PartitionOption = partitionOption; + PartitionSettings = partitionSettings; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets SQL reader query. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "sqlReaderQuery")] + public object SqlReaderQuery { get; set; } + + /// + /// Gets or sets name of the stored procedure for a SQL Database + /// source. This cannot be used at the same time as SqlReaderQuery. + /// Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "sqlReaderStoredProcedureName")] + public object SqlReaderStoredProcedureName { get; set; } + + /// + /// Gets or sets value and type setting for stored procedure + /// parameters. Example: "{Parameter1: {value: "1", type: "int"}}". + /// + [JsonProperty(PropertyName = "storedProcedureParameters")] + public IDictionary StoredProcedureParameters { get; set; } + + /// + /// Gets or sets which additional types to produce. + /// + [JsonProperty(PropertyName = "produceAdditionalTypes")] + public object ProduceAdditionalTypes { get; set; } + + /// + /// Gets or sets the partition mechanism that will be used for Sql read + /// in parallel. Possible values include: "None", + /// "PhysicalPartitionsOfTable", "DynamicRange". + /// + [JsonProperty(PropertyName = "partitionOption")] + public object PartitionOption { get; set; } + + /// + /// Gets or sets the settings that will be leveraged for Sql source + /// partitioning. + /// + [JsonProperty(PropertyName = "partitionSettings")] + public SqlPartitionSettings PartitionSettings { get; set; } + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForSqlServerTableDataset.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForSqlServerTableDataset.cs new file mode 100644 index 000000000000..a42d7a43c68b --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonRdsForSqlServerTableDataset.cs @@ -0,0 +1,99 @@ +// +// 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; + + /// + /// The Amazon RDS for SQL Server dataset. + /// + [Newtonsoft.Json.JsonObject("AmazonRdsForSqlServerTable")] + [Rest.Serialization.JsonTransformation] + public partial class AmazonRdsForSqlServerTableDataset : Dataset + { + /// + /// Initializes a new instance of the AmazonRdsForSqlServerTableDataset + /// class. + /// + public AmazonRdsForSqlServerTableDataset() + { + LinkedServiceName = new LinkedServiceReference(); + CustomInit(); + } + + /// + /// Initializes a new instance of the AmazonRdsForSqlServerTableDataset + /// class. + /// + /// Linked service reference. + /// 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. + /// The schema + /// name of the SQL Server dataset. Type: string (or Expression with + /// resultType string). + /// The table name of the SQL Server dataset. Type: + /// string (or Expression with resultType string). + public AmazonRdsForSqlServerTableDataset(LinkedServiceReference linkedServiceName, 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), object amazonRdsForSqlServerTableDatasetSchema = default(object), object table = default(object)) + : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) + { + AmazonRdsForSqlServerTableDatasetSchema = amazonRdsForSqlServerTableDatasetSchema; + Table = table; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the schema name of the SQL Server dataset. Type: + /// string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.schema")] + public object AmazonRdsForSqlServerTableDatasetSchema { get; set; } + + /// + /// Gets or sets the table name of the SQL Server dataset. Type: string + /// (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.table")] + public object Table { 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/IntegrationRuntimeCustomerVirtualNetwork.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeCustomerVirtualNetwork.cs new file mode 100644 index 000000000000..3525920e7512 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeCustomerVirtualNetwork.cs @@ -0,0 +1,56 @@ +// +// 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; + + /// + /// The definition and properties of virtual network to which Azure-SSIS + /// integration runtime will join. + /// + public partial class IntegrationRuntimeCustomerVirtualNetwork + { + /// + /// Initializes a new instance of the + /// IntegrationRuntimeCustomerVirtualNetwork class. + /// + public IntegrationRuntimeCustomerVirtualNetwork() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the + /// IntegrationRuntimeCustomerVirtualNetwork class. + /// + /// The ID of subnet to which Azure-SSIS + /// integration runtime will join. + public IntegrationRuntimeCustomerVirtualNetwork(string subnetId = default(string)) + { + SubnetId = subnetId; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the ID of subnet to which Azure-SSIS integration + /// runtime will join. + /// + [JsonProperty(PropertyName = "subnetId")] + public string SubnetId { get; set; } + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ManagedIntegrationRuntime.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ManagedIntegrationRuntime.cs index 3c75564aa8ce..d5f38bda3768 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ManagedIntegrationRuntime.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ManagedIntegrationRuntime.cs @@ -48,14 +48,17 @@ public ManagedIntegrationRuntime() /// integration runtime. /// SSIS properties for managed /// integration runtime. + /// The name of virtual network to + /// which Azure-SSIS integration runtime will join /// Managed Virtual Network /// reference. - public ManagedIntegrationRuntime(IDictionary additionalProperties = default(IDictionary), string description = default(string), string state = default(string), IntegrationRuntimeComputeProperties computeProperties = default(IntegrationRuntimeComputeProperties), IntegrationRuntimeSsisProperties ssisProperties = default(IntegrationRuntimeSsisProperties), ManagedVirtualNetworkReference managedVirtualNetwork = default(ManagedVirtualNetworkReference)) + public ManagedIntegrationRuntime(IDictionary additionalProperties = default(IDictionary), string description = default(string), string state = default(string), IntegrationRuntimeComputeProperties computeProperties = default(IntegrationRuntimeComputeProperties), IntegrationRuntimeSsisProperties ssisProperties = default(IntegrationRuntimeSsisProperties), IntegrationRuntimeCustomerVirtualNetwork customerVirtualNetwork = default(IntegrationRuntimeCustomerVirtualNetwork), ManagedVirtualNetworkReference managedVirtualNetwork = default(ManagedVirtualNetworkReference)) : base(additionalProperties, description) { State = state; ComputeProperties = computeProperties; SsisProperties = ssisProperties; + CustomerVirtualNetwork = customerVirtualNetwork; ManagedVirtualNetwork = managedVirtualNetwork; CustomInit(); } @@ -86,6 +89,13 @@ public ManagedIntegrationRuntime() [JsonProperty(PropertyName = "typeProperties.ssisProperties")] public IntegrationRuntimeSsisProperties SsisProperties { get; set; } + /// + /// Gets or sets the name of virtual network to which Azure-SSIS + /// integration runtime will join + /// + [JsonProperty(PropertyName = "typeProperties.customerVirtualNetwork")] + public IntegrationRuntimeCustomerVirtualNetwork CustomerVirtualNetwork { get; set; } + /// /// Gets or sets managed Virtual Network reference. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlAlwaysEncryptedAkvAuthType.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlAlwaysEncryptedAkvAuthType.cs index 2072bf64d6d1..b0dc3e353f24 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlAlwaysEncryptedAkvAuthType.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlAlwaysEncryptedAkvAuthType.cs @@ -18,5 +18,6 @@ public static class SqlAlwaysEncryptedAkvAuthType { public const string ServicePrincipal = "ServicePrincipal"; public const string ManagedIdentity = "ManagedIdentity"; + public const string UserAssignedManagedIdentity = "UserAssignedManagedIdentity"; } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlAlwaysEncryptedProperties.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlAlwaysEncryptedProperties.cs index 2feba7093053..70dbf4f4b8f9 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlAlwaysEncryptedProperties.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlAlwaysEncryptedProperties.cs @@ -35,17 +35,20 @@ public SqlAlwaysEncryptedProperties() /// Sql always encrypted AKV /// authentication type. Type: string (or Expression with resultType /// string). Possible values include: 'ServicePrincipal', - /// 'ManagedIdentity' + /// 'ManagedIdentity', 'UserAssignedManagedIdentity' /// The client ID of the application /// in Azure Active Directory used for Azure Key Vault authentication. /// Type: string (or Expression with resultType string). /// The key of the service principal /// used to authenticate against Azure Key Vault. - public SqlAlwaysEncryptedProperties(string alwaysEncryptedAkvAuthType, object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase)) + /// The credential reference containing + /// authentication information. + public SqlAlwaysEncryptedProperties(string alwaysEncryptedAkvAuthType, object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), CredentialReference credential = default(CredentialReference)) { AlwaysEncryptedAkvAuthType = alwaysEncryptedAkvAuthType; ServicePrincipalId = servicePrincipalId; ServicePrincipalKey = servicePrincipalKey; + Credential = credential; CustomInit(); } @@ -57,7 +60,8 @@ public SqlAlwaysEncryptedProperties() /// /// Gets or sets sql always encrypted AKV authentication type. Type: /// string (or Expression with resultType string). Possible values - /// include: 'ServicePrincipal', 'ManagedIdentity' + /// include: 'ServicePrincipal', 'ManagedIdentity', + /// 'UserAssignedManagedIdentity' /// [JsonProperty(PropertyName = "alwaysEncryptedAkvAuthType")] public string AlwaysEncryptedAkvAuthType { get; set; } @@ -77,6 +81,13 @@ public SqlAlwaysEncryptedProperties() [JsonProperty(PropertyName = "servicePrincipalKey")] public SecretBase ServicePrincipalKey { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "credential")] + public CredentialReference Credential { get; set; } + /// /// Validate the object. /// @@ -89,6 +100,10 @@ public virtual void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "AlwaysEncryptedAkvAuthType"); } + 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 a2cfc000436c..274954c37b4f 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,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. - 4.24.0 + 4.25.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 d5dd6aaf0cd2..a2cbce82465a 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("4.24.0.0")] -[assembly: AssemblyFileVersion("4.24.0.0")] +[assembly: AssemblyVersion("4.25.0.0")] +[assembly: AssemblyFileVersion("4.25.0.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] [assembly: AssemblyProduct("Microsoft Azure .NET SDK")] diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/DatasetJsonSamples.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/DatasetJsonSamples.cs index 0f2a1ae41a1a..45f7810f2612 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/DatasetJsonSamples.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/DatasetJsonSamples.cs @@ -1747,6 +1747,26 @@ public class DatasetJsonSamples : JsonSampleCollection } } } +"; + [JsonSample] + public const string AmazonRdsForSqlServerTableV2 = @" +{ + name: ""AmazonRdsForSqlServerTable"", + properties: + { + type: ""AmazonRdsForSqlServerTable"", + linkedServiceName: + { + referenceName : ""ls"", + type : ""LinkedServiceReference"" + }, + typeProperties: + { + schema: ""dbo"", + table: ""testtable"" + } + } +} "; [JsonSample] public const string AzureSqlDWTableV2 = @" diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/IntegrationRuntimeJsonSamples.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/IntegrationRuntimeJsonSamples.cs index b3753f4a8170..45ea7525a784 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/IntegrationRuntimeJsonSamples.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/IntegrationRuntimeJsonSamples.cs @@ -26,6 +26,9 @@ public class IntegrationRuntimeJsonSamples : JsonSampleCollection ] } } +"; + + [JsonSample(version: "Copy")] + public const string CopyAmazonRdsForSqlServerToBlobWithTabularTranslator = @" +{ + name: ""MyPipelineName"", + properties: + { + description : ""Copy from AmazonRdsForSqlServer to Blob"", + activities: + [ + { + type: ""Copy"", + name: ""TestActivity"", + description: ""Test activity description"", + typeProperties: + { + source: + { + type: ""AmazonRdsForSqlServerSource"", + sourceRetryCount: 2, + sourceRetryWait: ""00:00:01"", + sqlReaderQuery: ""$EncryptedString$MyEncryptedQuery"", + sqlReaderStoredProcedureName: ""CopyTestSrcStoredProcedureWithParameters"", + storedProcedureParameters: { + ""stringData"": { value: ""test"", type: ""String""}, + ""id"": { value: ""3"", type: ""Int""} + }, + isolationLevel: ""ReadCommitted"" + }, + sink: + { + type: ""BlobSink"", + blobWriterAddHeader: true, + writeBatchSize: 1000000, + writeBatchTimeout: ""01:00:00"" + }, + translator: + { + type: ""TabularTranslator"", + columnMappings: ""PartitionKey:PartitionKey"" + } + }, + inputs: + [ + { + referenceName: ""InputAmazonRdsForSqlServerDA"", type: ""DatasetReference"" + } + ], + outputs: + [ + { + referenceName: ""OutputBlobDA"", type: ""DatasetReference"" + } + ], + linkedServiceName: { referenceName: ""MyLinkedServiceName"", type: ""LinkedServiceReference"" }, + policy: + { + retry: 3, + timeout: ""00:00:05"", + } + } + ] + } +} "; [JsonSample(version: "Copy")]