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

[data factory] add tumblingWindowTrigger dependsOn and add Folder to pipeline and da… #4741

Merged
merged 4 commits into from
Sep 7, 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 @@ -149,6 +149,62 @@ public class TriggerJsonSamples : JsonSampleCollection<TriggerJsonSamples>
}
}
}
";

[JsonSample]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: please fix indentation

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The current Json samples also use these indentation, 8 spaces before [JsonSample], what do you want me to change to?

Copy link
Contributor

@dsgouda dsgouda Sep 6, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move the Json indentation to the right wrt code. Won't block on this.

public const string TumblingWindowTriggerWithDependencySample = @"
{
name: ""myDemoTWTriggerWithDependency"",
properties: {
type: ""TumblingWindowTrigger"",
typeProperties: {
frequency: ""Hour"",
interval: 24,
startTime: ""2017-04-14T13:00:00Z"",
endTime: ""2018-04-14T13:00:00Z"",
delay: ""00:00:01"",
retryPolicy: {
count: 3,
intervalInSeconds: 30
},
maxConcurrency: 10,
dependsOn: [{
type: ""TumblingWindowTriggerDependencyReference"",
referenceTrigger: {
type: ""TriggerReference"",
referenceName: ""myDemoTWTrigger1""
},
offset: ""00:00:00"",
size: ""02:00:00""
},
{
type: ""TumblingWindowTriggerDependencyReference"",
referenceTrigger: {
type: ""TriggerReference"",
referenceName: ""myDemoTWTrigger2""
},
offset: ""-00:30:00"",
size: ""00:30:00""
}]
},
pipeline: {
pipelineReference: {
type: ""PipelineReference"",
referenceName: ""myPipeline""
},
parameters: {
windowStart: {
type: ""Expression"",
value: ""@{trigger().outputs.windowStartTime}""
},
windowEnd: {
type: ""Expression"",
value: ""@{trigger().outputs.windowEndTime}""
},
}
}
}
}
";

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,19 @@ public partial class DataFactoryManagementClient : ServiceClient<DataFactoryMana
/// </summary>
public virtual ITriggerRunsOperations TriggerRuns { get; private set; }

/// <summary>
/// Initializes a new instance of the DataFactoryManagementClient class.
/// </summary>
/// <param name='httpClient'>
/// HttpClient to be used
/// </param>
/// <param name='disposeHttpClient'>
/// True: will dispose the provided httpClient on calling DataFactoryManagementClient.Dispose(). False: will not dispose provided httpClient</param>
protected DataFactoryManagementClient(HttpClient httpClient, bool disposeHttpClient) : base(httpClient, disposeHttpClient)
{
Initialize();
}

/// <summary>
/// Initializes a new instance of the DataFactoryManagementClient class.
/// </summary>
Expand Down Expand Up @@ -225,6 +238,33 @@ public DataFactoryManagementClient(ServiceClientCredentials credentials, params
}
}

/// <summary>
/// Initializes a new instance of the DataFactoryManagementClient class.
/// </summary>
/// <param name='credentials'>
/// Required. Credentials needed for the client to connect to Azure.
/// </param>
/// <param name='httpClient'>
/// HttpClient to be used
/// </param>
/// <param name='disposeHttpClient'>
/// True: will dispose the provided httpClient on calling DataFactoryManagementClient.Dispose(). False: will not dispose provided httpClient</param>
/// <exception cref="System.ArgumentNullException">
/// Thrown when a required parameter is null
/// </exception>
public DataFactoryManagementClient(ServiceClientCredentials credentials, HttpClient httpClient, bool disposeHttpClient) : this(httpClient, disposeHttpClient)
{
if (credentials == null)
{
throw new System.ArgumentNullException("credentials");
}
Credentials = credentials;
if (Credentials != null)
{
Credentials.InitializeServiceClient(this);
}
}

/// <summary>
/// Initializes a new instance of the DataFactoryManagementClient class.
/// </summary>
Expand Down Expand Up @@ -395,6 +435,8 @@ private void Initialize()
DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter<DatasetCompression>("type"));
SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter<DatasetStorageFormat>("type"));
DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter<DatasetStorageFormat>("type"));
SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter<DependencyReference>("type"));
DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter<DependencyReference>("type"));
SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter<CopySource>("type"));
DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter<CopySource>("type"));
SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter<CopyTranslator>("type"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,37 @@ namespace Microsoft.Azure.Management.DataFactory
/// </summary>
public partial interface IIntegrationRuntimeNodesOperations
{
/// <summary>
/// Gets a self-hosted integration runtime node.
/// </summary>
/// <param name='resourceGroupName'>
/// The resource group name.
/// </param>
/// <param name='factoryName'>
/// The factory name.
/// </param>
/// <param name='integrationRuntimeName'>
/// The integration runtime name.
/// </param>
/// <param name='nodeName'>
/// The integration runtime node name.
/// </param>
/// <param name='customHeaders'>
/// The headers that will be added to request.
/// </param>
/// <param name='cancellationToken'>
/// The cancellation token.
/// </param>
/// <exception cref="Microsoft.Rest.Azure.CloudException">
/// Thrown when the operation returned an invalid status code
/// </exception>
/// <exception cref="Microsoft.Rest.SerializationException">
/// Thrown when unable to deserialize the response
/// </exception>
/// <exception cref="Microsoft.Rest.ValidationException">
/// Thrown when a required parameter is null
/// </exception>
Task<AzureOperationResponse<SelfHostedIntegrationRuntimeNode>> GetWithHttpMessagesAsync(string resourceGroupName, string factoryName, string integrationRuntimeName, string nodeName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
/// <summary>
/// Deletes a self-hosted integration runtime node.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,38 @@ public partial interface IIntegrationRuntimesOperations
/// </exception>
Task<AzureOperationResponse> RemoveLinksWithHttpMessagesAsync(string resourceGroupName, string factoryName, string integrationRuntimeName, LinkedIntegrationRuntimeRequest linkedIntegrationRuntimeRequest, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
/// <summary>
/// Create a linked integration runtime entry in a shared integration
/// runtime.
/// </summary>
/// <param name='resourceGroupName'>
/// The resource group name.
/// </param>
/// <param name='factoryName'>
/// The factory name.
/// </param>
/// <param name='integrationRuntimeName'>
/// The integration runtime name.
/// </param>
/// <param name='createLinkedIntegrationRuntimeRequest'>
/// The linked integration runtime properties.
/// </param>
/// <param name='customHeaders'>
/// The headers that will be added to request.
/// </param>
/// <param name='cancellationToken'>
/// The cancellation token.
/// </param>
/// <exception cref="Microsoft.Rest.Azure.CloudException">
/// Thrown when the operation returned an invalid status code
/// </exception>
/// <exception cref="Microsoft.Rest.SerializationException">
/// Thrown when unable to deserialize the response
/// </exception>
/// <exception cref="Microsoft.Rest.ValidationException">
/// Thrown when a required parameter is null
/// </exception>
Task<AzureOperationResponse<IntegrationRuntimeStatusResponse>> CreateLinkedIntegrationRuntimeWithHttpMessagesAsync(string resourceGroupName, string factoryName, string integrationRuntimeName, CreateLinkedIntegrationRuntimeRequest createLinkedIntegrationRuntimeRequest, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
/// <summary>
/// Starts a ManagedReserved type integration runtime.
/// </summary>
/// <param name='resourceGroupName'>
Expand Down
Loading