Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add new LinkedService for vertica and netezza, update googleBigQuery #4070

Merged
merged 6 commits into from
Feb 13, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -845,6 +845,32 @@ public class DatasetJsonSamples : JsonSampleCollection<DatasetJsonSamples>
}
}
}
";
[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""
}
}
}
";
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -1038,6 +1038,14 @@ public class LinkedServiceJsonSamples : JsonSampleCollection<LinkedServiceJsonSa
type: ""SecureString"",
value: ""some secret""
},
clientId : {
type: ""SecureString"",
value: ""some secret""
},
clientSecret : {
type: ""SecureString"",
value: ""some secret""
},
useSystemTrustStore : true
}
}
Expand Down Expand Up @@ -1439,6 +1447,36 @@ public class LinkedServiceJsonSamples : JsonSampleCollection<LinkedServiceJsonSa
}
}
}
";
[JsonSample]
public const string NetezzaLinkedService = @"
{
name: ""NetezzaLinkedService"",
properties: {
type: ""Netezza"",
typeProperties: {
connectionString: {
type: ""SecureString"",
value: ""some connection string""
}
}
}
}
";
[JsonSample]
public const string VerticaLinkedService = @"
{
name: ""VerticaLinkedService"",
properties: {
type: ""Vertica"",
typeProperties: {
connectionString: {
type: ""SecureString"",
value: ""some connection string""
}
}
}
}
";
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3198,5 +3198,72 @@ public class PipelineJsonSamples : JsonSampleCollection<PipelineJsonSamples>
}
}
";
[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""
}
]
}
]
}
}";
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ public GoogleBigQueryLinkedService()
/// Drive. The default value is false.</param>
/// <param name="refreshToken">The refresh token obtained from Google
/// for authorizing access to BigQuery for UserAuthentication.</param>
/// <param name="clientId">The client id of the google application used
/// to acquire the refresh token.</param>
/// <param name="clientSecret">The client secret of the google
/// application used to acquire the refresh token.</param>
/// <param name="email">The service account email ID that is used for
/// ServiceAuthentication and can only be used on self-hosted
/// IR.</param>
Expand All @@ -73,14 +77,16 @@ public GoogleBigQueryLinkedService()
/// authentication. Credentials are encrypted using the integration
/// runtime credential manager. Type: string (or Expression with
/// resultType string).</param>
public GoogleBigQueryLinkedService(object project, string authenticationType, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), 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<string, object> additionalProperties = default(IDictionary<string, object>), 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;
AdditionalProjects = additionalProjects;
RequestGoogleDriveScope = requestGoogleDriveScope;
AuthenticationType = authenticationType;
RefreshToken = refreshToken;
ClientId = clientId;
ClientSecret = clientSecret;
Email = email;
KeyFilePath = keyFilePath;
TrustedCertPath = trustedCertPath;
Expand Down Expand Up @@ -132,6 +138,20 @@ public GoogleBigQueryLinkedService()
[JsonProperty(PropertyName = "typeProperties.refreshToken")]
public SecretBase RefreshToken { get; set; }

/// <summary>
/// Gets or sets the client id of the google application used to
/// acquire the refresh token.
/// </summary>
[JsonProperty(PropertyName = "typeProperties.clientId")]
public SecretBase ClientId { get; set; }

/// <summary>
/// Gets or sets the client secret of the google application used to
/// acquire the refresh token.
/// </summary>
[JsonProperty(PropertyName = "typeProperties.clientSecret")]
public SecretBase ClientSecret { get; set; }

/// <summary>
/// Gets or sets the service account email ID that is used for
/// ServiceAuthentication and can only be used on self-hosted IR.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
// <auto-generated>
// 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.
// </auto-generated>

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;

/// <summary>
/// Netezza linked service.
/// </summary>
[Newtonsoft.Json.JsonObject("Netezza")]
[Rest.Serialization.JsonTransformation]
public partial class NetezzaLinkedService : LinkedService
{
/// <summary>
/// Initializes a new instance of the NetezzaLinkedService class.
/// </summary>
public NetezzaLinkedService()
{
CustomInit();
}

/// <summary>
/// Initializes a new instance of the NetezzaLinkedService class.
/// </summary>
/// <param name="additionalProperties">Unmatched properties from the
/// message are deserialized this collection</param>
/// <param name="connectVia">The integration runtime reference.</param>
/// <param name="description">Linked service description.</param>
/// <param name="connectionString">An ODBC connection string.</param>
/// <param name="encryptedCredential">The encrypted credential used for
/// authentication. Credentials are encrypted using the integration
/// runtime credential manager. Type: string (or Expression with
/// resultType string).</param>
public NetezzaLinkedService(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), 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();
}

/// <summary>
/// An initialization method that performs custom operations like setting defaults
/// </summary>
partial void CustomInit();

/// <summary>
/// Gets or sets an ODBC connection string.
/// </summary>
[JsonProperty(PropertyName = "typeProperties.connectionString")]
public SecretBase ConnectionString { get; set; }

/// <summary>
/// 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).
/// </summary>
[JsonProperty(PropertyName = "typeProperties.encryptedCredential")]
public object EncryptedCredential { get; set; }

/// <summary>
/// Validate the object.
/// </summary>
/// <exception cref="ValidationException">
/// Thrown if validation fails
/// </exception>
public override void Validate()
{
base.Validate();
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
// <auto-generated>
// 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.
// </auto-generated>

namespace Microsoft.Azure.Management.DataFactory.Models
{
using Newtonsoft.Json;
using System.Collections;
using System.Collections.Generic;
using System.Linq;

/// <summary>
/// A copy activity Netezza source.
/// </summary>
public partial class NetezzaSource : CopySource
{
/// <summary>
/// Initializes a new instance of the NetezzaSource class.
/// </summary>
public NetezzaSource()
{
CustomInit();
}

/// <summary>
/// Initializes a new instance of the NetezzaSource class.
/// </summary>
/// <param name="additionalProperties">Unmatched properties from the
/// message are deserialized this collection</param>
/// <param name="sourceRetryCount">Source retry count. Type: integer
/// (or Expression with resultType integer).</param>
/// <param name="sourceRetryWait">Source retry wait. Type: string (or
/// Expression with resultType string), pattern:
/// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])).</param>
/// <param name="query">A query to retrieve data from source. Type:
/// string (or Expression with resultType string).</param>
public NetezzaSource(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object query = default(object))
: base(additionalProperties, sourceRetryCount, sourceRetryWait)
{
Query = query;
CustomInit();
}

/// <summary>
/// An initialization method that performs custom operations like setting defaults
/// </summary>
partial void CustomInit();

/// <summary>
/// Gets or sets a query to retrieve data from source. Type: string (or
/// Expression with resultType string).
/// </summary>
[JsonProperty(PropertyName = "query")]
public object Query { get; set; }

}
}
Loading