diff --git a/src/SDKs/DataFactory/DataFactory.Tests/JsonSamples/DatasetJsonSamples.cs b/src/SDKs/DataFactory/DataFactory.Tests/JsonSamples/DatasetJsonSamples.cs index 3b547aaa2525d..61a1de40e904c 100644 --- a/src/SDKs/DataFactory/DataFactory.Tests/JsonSamples/DatasetJsonSamples.cs +++ b/src/SDKs/DataFactory/DataFactory.Tests/JsonSamples/DatasetJsonSamples.cs @@ -845,6 +845,32 @@ public class DatasetJsonSamples : JsonSampleCollection } } } +"; + [JsonSample] + public const string NetezzaDataset = @" +{ + name: ""NetezzaDataset"", + properties: { + type: ""NetezzaTable"", + linkedServiceName: { + referenceName: ""ls"", + type: ""LinkedServiceReference"" + } + } +} +"; + [JsonSample] + public const string VerticaDataset = @" +{ + name: ""VerticaDataset"", + properties: { + type: ""VerticaTable"", + linkedServiceName: { + referenceName: ""ls"", + type: ""LinkedServiceReference"" + } + } +} "; } } diff --git a/src/SDKs/DataFactory/DataFactory.Tests/JsonSamples/LinkedServiceJsonSamples.cs b/src/SDKs/DataFactory/DataFactory.Tests/JsonSamples/LinkedServiceJsonSamples.cs index a593bc3f9444f..cdf0f51e25370 100644 --- a/src/SDKs/DataFactory/DataFactory.Tests/JsonSamples/LinkedServiceJsonSamples.cs +++ b/src/SDKs/DataFactory/DataFactory.Tests/JsonSamples/LinkedServiceJsonSamples.cs @@ -1038,6 +1038,14 @@ public class LinkedServiceJsonSamples : JsonSampleCollection } } "; + [JsonSample(version: "Copy")] + public const string CopyNetezzaToBlob = @" +{ + name: ""MyPipelineName"", + properties: { + activities: [ + { + type: ""Copy"", + name: ""CopyNetezzaToBlob"", + description: ""Test activity description"", + typeProperties: { + source: { + type: ""NetezzaSource"", + query: ""select * from a table"" + }, + sink: { + type: ""BlobSink"" + } + }, + inputs: [ + { + referenceName: ""NetezzaDataset"", type: ""DatasetReference"" + } + ], + outputs: [ + { + referenceName: ""BlobDataset"", type: ""DatasetReference"" + } + ] + } + ] + } +}"; + + [JsonSample(version: "Copy")] + public const string CopyVerticaToBlob = @" +{ + name: ""MyPipelineName"", + properties: { + activities: [ + { + type: ""Copy"", + name: ""CopyVerticaToBlob"", + description: ""Test activity description"", + typeProperties: { + source: { + type: ""VerticaSource"", + query: ""select * from a table"" + }, + sink: { + type: ""BlobSink"" + } + }, + inputs: [ + { + referenceName: ""VerticaDataset"", type: ""DatasetReference"" + } + ], + outputs: [ + { + referenceName: ""BlobDataset"", type: ""DatasetReference"" + } + ] + } + ] + } +}"; } } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/GoogleBigQueryLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/GoogleBigQueryLinkedService.cs index f3442fa62d186..647aad8094fee 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/GoogleBigQueryLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/GoogleBigQueryLinkedService.cs @@ -55,6 +55,10 @@ public GoogleBigQueryLinkedService() /// Drive. The default value is false. /// The refresh token obtained from Google /// for authorizing access to BigQuery for UserAuthentication. + /// The client id of the google application used + /// to acquire the refresh token. + /// 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. @@ -73,7 +77,7 @@ public GoogleBigQueryLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public GoogleBigQueryLinkedService(object project, string authenticationType, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), object additionalProjects = default(object), object requestGoogleDriveScope = default(object), SecretBase refreshToken = default(SecretBase), object email = default(object), object keyFilePath = default(object), object trustedCertPath = default(object), object useSystemTrustStore = default(object), object encryptedCredential = default(object)) + public GoogleBigQueryLinkedService(object project, string authenticationType, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), object additionalProjects = default(object), object requestGoogleDriveScope = default(object), SecretBase refreshToken = default(SecretBase), SecretBase clientId = default(SecretBase), 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) { Project = project; @@ -81,6 +85,8 @@ public GoogleBigQueryLinkedService() RequestGoogleDriveScope = requestGoogleDriveScope; AuthenticationType = authenticationType; RefreshToken = refreshToken; + ClientId = clientId; + ClientSecret = clientSecret; Email = email; KeyFilePath = keyFilePath; TrustedCertPath = trustedCertPath; @@ -132,6 +138,20 @@ public GoogleBigQueryLinkedService() [JsonProperty(PropertyName = "typeProperties.refreshToken")] public SecretBase RefreshToken { get; set; } + /// + /// Gets or sets the client id of the google application used to + /// acquire the refresh token. + /// + [JsonProperty(PropertyName = "typeProperties.clientId")] + public SecretBase ClientId { get; set; } + + /// + /// Gets or sets the client secret of the google application used to + /// acquire the refresh token. + /// + [JsonProperty(PropertyName = "typeProperties.clientSecret")] + public SecretBase ClientSecret { get; set; } + /// /// Gets or sets the service account email ID that is used for /// ServiceAuthentication and can only be used on self-hosted IR. diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/NetezzaLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/NetezzaLinkedService.cs new file mode 100644 index 0000000000000..15cbf17be1228 --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/NetezzaLinkedService.cs @@ -0,0 +1,85 @@ +// +// 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; + + /// + /// Netezza linked service. + /// + [Newtonsoft.Json.JsonObject("Netezza")] + [Rest.Serialization.JsonTransformation] + public partial class NetezzaLinkedService : LinkedService + { + /// + /// Initializes a new instance of the NetezzaLinkedService class. + /// + public NetezzaLinkedService() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the NetezzaLinkedService class. + /// + /// Unmatched properties from the + /// message are deserialized this collection + /// The integration runtime reference. + /// Linked service description. + /// An ODBC connection string. + /// The encrypted credential used for + /// authentication. Credentials are encrypted using the integration + /// runtime credential manager. Type: string (or Expression with + /// resultType string). + public NetezzaLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), SecretBase connectionString = default(SecretBase), object encryptedCredential = default(object)) + : base(additionalProperties, connectVia, description) + { + ConnectionString = connectionString; + EncryptedCredential = encryptedCredential; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets an ODBC connection string. + /// + [JsonProperty(PropertyName = "typeProperties.connectionString")] + public SecretBase ConnectionString { 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/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/NetezzaSource.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/NetezzaSource.cs new file mode 100644 index 0000000000000..59e51ed29a203 --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/NetezzaSource.cs @@ -0,0 +1,63 @@ +// +// 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 Netezza source. + /// + public partial class NetezzaSource : CopySource + { + /// + /// Initializes a new instance of the NetezzaSource class. + /// + public NetezzaSource() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the NetezzaSource 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])). + /// A query to retrieve data from source. Type: + /// string (or Expression with resultType string). + public NetezzaSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait) + { + Query = query; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets a query to retrieve data from source. Type: string (or + /// Expression with resultType string). + /// + [JsonProperty(PropertyName = "query")] + public object Query { get; set; } + + } +} diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/NetezzaTableDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/NetezzaTableDataset.cs new file mode 100644 index 0000000000000..3afcd0a95b53d --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/NetezzaTableDataset.cs @@ -0,0 +1,66 @@ +// +// 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; + + /// + /// Netezza dataset. + /// + [Newtonsoft.Json.JsonObject("NetezzaTable")] + public partial class NetezzaTableDataset : Dataset + { + /// + /// Initializes a new instance of the NetezzaTableDataset class. + /// + public NetezzaTableDataset() + { + LinkedServiceName = new LinkedServiceReference(); + CustomInit(); + } + + /// + /// Initializes a new instance of the NetezzaTableDataset 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. + /// Parameters for dataset. + public NetezzaTableDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary)) + : base(linkedServiceName, additionalProperties, description, structure, parameters) + { + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public override void Validate() + { + base.Validate(); + } + } +} diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/VerticaLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/VerticaLinkedService.cs new file mode 100644 index 0000000000000..b25847605277f --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/VerticaLinkedService.cs @@ -0,0 +1,85 @@ +// +// 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; + + /// + /// Vertica linked service. + /// + [Newtonsoft.Json.JsonObject("Vertica")] + [Rest.Serialization.JsonTransformation] + public partial class VerticaLinkedService : LinkedService + { + /// + /// Initializes a new instance of the VerticaLinkedService class. + /// + public VerticaLinkedService() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the VerticaLinkedService class. + /// + /// Unmatched properties from the + /// message are deserialized this collection + /// The integration runtime reference. + /// Linked service description. + /// An ODBC connection string. + /// The encrypted credential used for + /// authentication. Credentials are encrypted using the integration + /// runtime credential manager. Type: string (or Expression with + /// resultType string). + public VerticaLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), SecretBase connectionString = default(SecretBase), object encryptedCredential = default(object)) + : base(additionalProperties, connectVia, description) + { + ConnectionString = connectionString; + EncryptedCredential = encryptedCredential; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets an ODBC connection string. + /// + [JsonProperty(PropertyName = "typeProperties.connectionString")] + public SecretBase ConnectionString { 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/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/VerticaSource.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/VerticaSource.cs new file mode 100644 index 0000000000000..2ebb0c0281148 --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/VerticaSource.cs @@ -0,0 +1,63 @@ +// +// 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 Vertica source. + /// + public partial class VerticaSource : CopySource + { + /// + /// Initializes a new instance of the VerticaSource class. + /// + public VerticaSource() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the VerticaSource 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])). + /// A query to retrieve data from source. Type: + /// string (or Expression with resultType string). + public VerticaSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object query = default(object)) + : base(additionalProperties, sourceRetryCount, sourceRetryWait) + { + Query = query; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets a query to retrieve data from source. Type: string (or + /// Expression with resultType string). + /// + [JsonProperty(PropertyName = "query")] + public object Query { get; set; } + + } +} diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/VerticaTableDataset.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/VerticaTableDataset.cs new file mode 100644 index 0000000000000..258077d20f90d --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/VerticaTableDataset.cs @@ -0,0 +1,66 @@ +// +// 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; + + /// + /// Vertica dataset. + /// + [Newtonsoft.Json.JsonObject("VerticaTable")] + public partial class VerticaTableDataset : Dataset + { + /// + /// Initializes a new instance of the VerticaTableDataset class. + /// + public VerticaTableDataset() + { + LinkedServiceName = new LinkedServiceReference(); + CustomInit(); + } + + /// + /// Initializes a new instance of the VerticaTableDataset 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. + /// Parameters for dataset. + public VerticaTableDataset(LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), IDictionary parameters = default(IDictionary)) + : base(linkedServiceName, additionalProperties, description, structure, parameters) + { + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public override void Validate() + { + base.Validate(); + } + } +} diff --git a/src/SDKs/DataFactory/Management.DataFactory/changelog.md b/src/SDKs/DataFactory/Management.DataFactory/changelog.md index 050b497b879ad..d72242a43a689 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/changelog.md +++ b/src/SDKs/DataFactory/Management.DataFactory/changelog.md @@ -4,6 +4,8 @@ ### Feature Additions * Add SAP ECC Source + * GoogleBigQuery support clientId and clientSecret for UserAuthentication + * Add LinkedService, Dataset, CopySource for Vertica and Netezza ## Version 0.5.0-preview diff --git a/src/SDKs/_metadata/datafactory_resource-manager.txt b/src/SDKs/_metadata/datafactory_resource-manager.txt index 6298706b8d5cd..9c7c419e2141c 100644 --- a/src/SDKs/_metadata/datafactory_resource-manager.txt +++ b/src/SDKs/_metadata/datafactory_resource-manager.txt @@ -1,11 +1,11 @@ -2018-02-08 02:32:23 UTC +2018-02-13 05:02:29 UTC 1) azure-rest-api-specs repository information GitHub user: Azure Branch: master -Commit: 24071a7c302f86686bec19f033ab7e13da3ebce7 +Commit: 9896f6e159859637338287e40b48ad910548e934 2) AutoRest information Requested version: latest -Bootstrapper version: C:\Users\yanzhang\AppData\Roaming\npm `-- autorest@2.0.4245 +Bootstrapper version: C:\Users\fexiao\AppData\Roaming\npm `-- autorest@2.0.4245 Latest installed version: